November 2009 - Nuiton-matrix-commits - mailman.cloud.codelutin.com

r201 - trunk
by echatellier＠users.nuiton.org 26 Nov '09

26 Nov '09

Author: echatellier Date: 2009-11-26 15:21:13 +0100 (Thu, 26 Nov 2009) New Revision: 201 Modified: trunk/pom.xml Log: Update beanutils Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-04 15:36:37 UTC (rev 200) +++ trunk/pom.xml 2009-11-26 14:21:13 UTC (rev 201) @@ -36,7 +36,7 @@ <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.8.1</version> + <version>1.8.2</version> <scope>compile</scope> </dependency>

1 0

r200 - in trunk: . src/main/java/org/nuiton/math/matrix/gui
by echatellier＠users.nuiton.org 04 Nov '09

04 Nov '09

Author: echatellier Date: 2009-11-04 16:36:37 +0100 (Wed, 04 Nov 2009) New Revision: 200 Added: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.jaxx Removed: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.java Modified: trunk/changelog.txt trunk/src/main/java/org/nuiton/math/matrix/gui/JAXXMatrixEditor.jaxx Log: MatrixPanelEditor panel listeners are now 'non weak references' MatrixPanelEditor has been rewritten is Jaxx (some breakage may occur) JAXXMatrixEditor has been deprecated (use MatrixPanelEditor) Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-11-04 14:22:06 UTC (rev 199) +++ trunk/changelog.txt 2009-11-04 15:36:37 UTC (rev 200) @@ -1,4 +1,7 @@ ver-2.0.1 chatellier + * MatrixPanelEditor panel listeners are now 'non weak references' + * MatrixPanelEditor has been rewritten is Jaxx (some breakage may occur) + * JAXXMatrixEditor has been deprecated (use MatrixPanelEditor) * Display translated column names (i18n) ver-2.0 chatellier Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/JAXXMatrixEditor.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/JAXXMatrixEditor.jaxx 2009-11-04 14:22:06 UTC (rev 199) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/JAXXMatrixEditor.jaxx 2009-11-04 15:36:37 UTC (rev 200) @@ -51,15 +51,25 @@ protected MatrixPopupMenu popupMenu = null; protected MatrixND matrix = null; initObject(); + +/** + * @deprecated since 2.0.1 use MatrixPanelEditor + */ public JAXXMatrixEditor(MatrixND m, boolean dimensionEdit) { this(dimensionEdit, DEFAULT_WIDTH, DEFAULT_HEIGHT); } +/** + * @deprecated since 2.0.1 use MatrixPanelEditor + */ public JAXXMatrixEditor(boolean dimensionEdit, int width, int height) { this.dimensionEdit = dimensionEdit; setPreferredSize(new Dimension(width, height)); } +/** + * @deprecated since 2.0.1 use MatrixPanelEditor + */ public JAXXMatrixEditor(boolean dimensionEdit) { this(dimensionEdit, DEFAULT_WIDTH, DEFAULT_HEIGHT); } Deleted: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.java 2009-11-04 14:22:06 UTC (rev 199) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.java 2009-11-04 15:36:37 UTC (rev 200) @@ -1,507 +0,0 @@ -/* - * *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.nuiton.math.matrix.gui; - -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.Event; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; -import java.awt.event.MouseEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - -import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.JOptionPane; -import javax.swing.JScrollPane; -import javax.swing.JTable; -import javax.swing.KeyStroke; -import javax.swing.ListSelectionModel; -import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; - -import org.nuiton.i18n.I18n; -import org.nuiton.math.matrix.MatrixException; -import org.nuiton.math.matrix.MatrixFactory; -import org.nuiton.math.matrix.MatrixND; -import org.nuiton.util.ListenerSet; - -/** - * JPanel contenant une JTable pour afficher une Matrice a une ou deux - * dimension. - * - * TODO: Une methode permettant de retourne la sous matrice de la selection que - * la matrice soit reprensentée en lineaire ou non. (avoir un mapping cellule de - * table vers element de matrice - * - * Created: 29 oct. 2004 - * - * @author Benjamin Poussin <poussin(a)codelutin.com> - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ -public class MatrixPanelEditor extends MatrixEditor implements TableModelListener { // MatrixPanelEditor - - /** serialVersionUID */ - private static final long serialVersionUID = 2097859265435050946L; - private final static int DEFAULT_WIDTH = 150; - private final static int DEFAULT_HEIGHT = 150; - protected ListenerSet<MatrixPanelListener> listeners = new ListenerSet<MatrixPanelListener>(); - protected JTable table; - protected MatrixND m; - protected MatrixTableModel tableModel; - protected JScrollPane editArea; - protected MatrixPopupMenu popupMenu; - // protected JTextArea text; - /** if true, use linear representation of matrix */ - protected boolean linearModel = false; - /** if false don't show default value in matrix (ex: 0) */ - protected boolean linearModelShowDefault = false; - /** Boolean to authorize table editing. - * @deprecated since 2.0.0 : duplicate field from parent for nothing! - */ - @Deprecated - protected boolean enabled = true; - /** Boolean to show matrix. - * @deprecated since 2.0.0 : duplicate field from parent for nothing! - */ - @Deprecated - protected boolean visible = true; - /** Boolean to autorize matrice dimension changes. */ - protected boolean dimensionEdit; - - /** - * Construct a new JPanel to edit matrix. - * - * @param m the matrix to edit. - * @param dimensionEdit to enabled matrix dimension changes. - */ - public MatrixPanelEditor(MatrixND m, boolean dimensionEdit) { - this(dimensionEdit, DEFAULT_WIDTH, DEFAULT_HEIGHT); - setMatrix(m); - } - - /** - * Construct a new JPanel to edit matrix. - * - * @param dimensionEdit to enabled matrix dimension changes. - * @param width width prefered for the component - * @param height height prefered for the component - */ - public MatrixPanelEditor(boolean dimensionEdit, int width, int height) { - this.dimensionEdit = dimensionEdit; - setPreferredSize(new Dimension(width, height)); - initObjet(); - } - - /** - * Construct a new JPanel to edit matrix. - * - * @param dimensionEdit to enabled matrix dimension changes. - */ - public MatrixPanelEditor(boolean dimensionEdit) { - this(dimensionEdit, DEFAULT_WIDTH, DEFAULT_HEIGHT); - } - - /** - * Construct a new JPanel to edit matrix. Matrix dimension can not change. - */ - public MatrixPanelEditor() { - this(false); - } - - protected MatrixFactory getFactory() { - return MatrixFactory.getInstance(); - } - - /** - * - * @param l listener to add - * @deprecated since 2.0.0 : this is not a valid listener adder - */ - @Deprecated - public void addMatrixListener(MatrixPanelListener l) { - listeners.add(l); - } - - /** - * - * @param l listener to add - * @since 2.0.0 - */ - public void addMatrixPanelListener(MatrixPanelListener l) { - listeners.add(l); - } - - /** - * - * @param l listener to remove - * @since 2.0.0 - */ - public void removeMatrixPanelListener(MatrixPanelListener l) { - listeners.remove(l); - } - - /** - * - * @return the listeners registred - * @since 2.0.0 - */ - public MatrixPanelListener[] getMatrixPanelListeners() { - java.util.List<MatrixPanelListener> r = new java.util.ArrayList<MatrixPanelListener>(); - for (java.util.Iterator<MatrixPanelListener> itr = listeners.iterator(); itr.hasNext();) { - r.add(itr.next()); - } - return r.toArray(new MatrixPanelListener[r.size()]); - } - - protected void initObjet() { - setLayout(new BorderLayout()); - editArea = new JScrollPane(); - add(editArea, BorderLayout.CENTER); - initDimensionEdit(); - } - protected JButton bEdit = null; - - @Override - public JButton getButtonEdit() { - if (bEdit == null) { - bEdit = new JButton(I18n._("nuitonmatrix.create.matrix.button")); - bEdit.addActionListener(new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - String dim; - dim = JOptionPane.showInputDialog(null, I18n._("nuitonmatrix.create.matrix.message"), I18n._("nuitonmatrix.create.matrix.title"), - JOptionPane.DEFAULT_OPTION); - - if (dim != null) { - String[] sdim = dim.split(";"); - int[] idim = new int[sdim.length]; - for (int i = 0; i < idim.length; i++) { - idim[i] = Integer.parseInt(sdim[i]); - } - setMatrix(getFactory().create(idim)); - } - } - }); - add(bEdit, BorderLayout.SOUTH); - } - return bEdit; - } - - /** - * @return Returns the linearModel. - */ - @Override - public Boolean isLinearModel() { - return this.linearModel; - } - - /** - * @param linearModel The linearModel to set. - */ - @Override - public void setLinearModel(Boolean linearModel) { - this.linearModel = linearModel; - initObject(m); - } - - /** - * @return Returns the linearModelShowDefault. - */ - @Override - public Boolean isLinearModelShowDefault() { - return this.linearModelShowDefault; - } - - /** - * @param linearModelShowDefault The linearModelShowDefault to set. - */ - @Override - public void setLinearModelShowDefault(Boolean linearModelShowDefault) { - this.linearModelShowDefault = linearModelShowDefault; - initObject(m); - } - - /** - * Get the value of dimensionEdit. - * - * @return value of dimensionEdit. - */ - public boolean isDimensionEdit() { - return dimensionEdit; - } - - /** - * Set the value of dimensionEdit. - * - * @param v Value to assign to dimensionEdit. - */ - public void setDimensionEdit(boolean v) { - this.dimensionEdit = v; - initDimensionEdit(); - } - - protected void initDimensionEdit() { - getButtonEdit().setVisible(dimensionEdit); - } - - protected void initObject(MatrixND m) { - if (m == null) { - editArea.setViewportView(null); - } else { // if (m.getNbDim() <= 2) { - // pour les matrices 1D et 2D - JTable t = getTable(); - if (isLinearModel()) { - tableModel = new MatrixTableModelLinear(m, - isLinearModelShowDefault()); - } else { - tableModel = new MatrixTableModelND(m); - } - t.getModel().removeTableModelListener(this); - tableModel.addTableModelListener(this); - t.setModel(tableModel); - t.setDefaultRenderer(String.class, tableModel.getMatrixCellRenderer()); - editArea.setViewportView(t); - // next line is needed otherwize matrix doesn't appear - add(editArea, BorderLayout.CENTER); - // if (table.getColumnCount() > 0 && m.getNbDim() > 1) { - // table.getColumnModel().getColumn(0).setCellRenderer( - // tableModel.getMatrixCellRenderer()); - // } - // text = null; - } - // else { - // // pour les matrices 3D et plus - // text = new JTextArea(); - // editArea.setViewportView(text); - // text.setText(MatrixHelper.encodeToXML(m)); - // table = null; - // editArea.setColumnHeaderView(null); - // } - setEnabled(enabled); - setVisible(visible); - repaint(); - } - - @Override - public JTable getTable() { - if (table == null) { - popupMenu = new MatrixPopupMenu(this); - table = new JTable() { - - private final static long serialVersionUID = 1l; - - @Override - public void processMouseEvent(MouseEvent event) { - if (event.isPopupTrigger()) { - popupMenu.show(event.getComponent(), event.getX(), - event.getY()); - } - super.processMouseEvent(event); - } - }; - - table.getInputMap().put( - KeyStroke.getKeyStroke(KeyEvent.VK_C, Event.CTRL_MASK), - "copy"); - table.getActionMap().put("copy", - popupMenu.getSendToClipBoardSelectionCopyAction()); - - table.getInputMap().put( - KeyStroke.getKeyStroke(KeyEvent.VK_V, Event.CTRL_MASK), - "paste"); - table.getActionMap().put("paste", - popupMenu.getSendToClipBoardCurrentPasteAction()); - - /* - * table.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_A, - * Event.CTRL_MASK), "selectAll"); - * table.getActionMap().put("selectAll", new AbstractAction(){ - * public void actionPerformed(ActionEvent e) { table.selectAll(); - * }}); - */ - - table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); - table.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION); - table.setCellSelectionEnabled(true); - - } - return table; - } - - @Override - public void setMatrix(MatrixND m) throws MatrixException { - initObject(m); - this.m = m; - fireEvent(); - } - - @Override - public MatrixND getMatrix() { - // if (m == null) { - return m; - // } else if (m.getNbDim() <= 2) { - // return m; - // } else { - // return MatrixHelper.decodeFromXML(text.getText()); - // } - } - - /** - * Enable the matrix to be edited. By default, the matrix is editable. - */ - @Override - public void setEnabled(boolean enabled) { - if (tableModel != null) { - tableModel.setEnabled(enabled); - } - if (table != null) { - table.setEnabled(enabled); - } - super.setEnabled(enabled); - // if (text != null) { - // text.setEditable(enabled); - // } - // si la table n'est pas editable, inutile de laisser le bouton - // de creation de matrice. - if (!enabled && dimensionEdit) { - dimensionEdit = false; - initDimensionEdit(); - } - if (!enabled) { - editArea.setViewportView(null); - } - this.enabled = enabled; - } - - @Override - public boolean isEnabled() { - return enabled; - } - - /** - * Set the matrix visible. By default, the matrix is visible. - * @param visible - */ - @Override - public void setVisible(boolean visible) { - if (table != null) { - table.setVisible(visible); - } - super.setVisible(visible); - this.visible = visible; - } - - @Override - public boolean isVisible() { - return visible; - } - /* - * @see javax.swing.event.TableModelListener#tableChanged(javax.swing.event.TableModelEvent) - */ - - @Override - public void tableChanged(TableModelEvent e) { - fireEvent(); - } - - @Override - protected void fireEvent() { - MatrixPanelEvent e = new MatrixPanelEvent(this); - for (Iterator<MatrixPanelListener> i = listeners.iterator(); i.hasNext();) { - MatrixPanelListener l = i.next(); - l.matrixChanged(e); - } - } - - /** - * Une petite fonction main pour le test... - * @param args - */ - public static void main(String[] args) { - I18n.init("fr", "FR"); - // I18n.init("en","EN"); - - JFrame frame = new JFrame(); - MatrixPanelEditor ed = null; - - try { - ed = new MatrixPanelEditor(true); - ed.setLinearModel(false); - frame.getContentPane().add(ed); - - // MatriceND m = new MatriceNDImpl(new int[]{4,4}); - // m.set(new int[]{0,0}, new Const(0)); - // m.set(new int[]{0,1}, new Const(1)); - // m.set(new int[]{0,2}, new Const(2)); - // m.set(new int[]{1,0}, new Const(3)); - // m.set(new int[]{1,1}, new Const(4)); - // m.set(new int[]{1,2}, new Const(5)); - - List<String> sem1 = Arrays.asList(new String[]{"toto", "titi", "tutu"}); - List<String> sem2 = Arrays.asList(new String[]{"tata", "tete", "tyty"}); - List<String> sem3 = Arrays.asList(new String[]{"riri", "fifi", "loulou"}); - - /* - * MatrixND m = MatrixFactory.getInstance().create(new - * int[]{100,100}); - */ - - /* - * MatrixND m = MatrixFactory.getInstance().create("name", new - * List[] { sem1, sem2 }, new String[]{"dim1", "dim2"}); - * m.setValue(0, 0, 1); m.setValue(0, 1, 2); m.setValue(0, 2, 3); - */ - - MatrixND m = MatrixFactory.getInstance().create("name", - new List<?>[]{sem1, sem2, sem3}, - new String[]{"dim1", "dim2", "dim3"}); - - m.setValue(0, 0, 0, 1); - m.setValue(0, 1, 0, 2); - m.setValue(0, 0, 1, 3); - - ed.setMatrix(m); - // ed.setEnabled(false); - } catch (MatrixException e) { - e.printStackTrace(); - System.exit(0); - } - - // final MatrixPanelEditor mp = ed; - frame.addWindowListener(new WindowAdapter() { - - @Override - public void windowClosing(WindowEvent e) { - System.exit(0); - } - }); - frame.pack(); - frame.setVisible(true); - } -} // MatrixPanelEditor - Added: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.jaxx (rev 0) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.jaxx 2009-11-04 15:36:37 UTC (rev 200) @@ -0,0 +1,160 @@ + +<MatrixEditor layout='{new BorderLayout()}'> + + <MatrixTableModel id='tableModel' javaBean='null'/> + +  + <Boolean id='linearModel' javaBean='false'/> + +  + <Boolean id='linearModelShowDefault' javaBean='false'/> + +  + <Boolean id='dimensionEdit' javaBean='false'/> + + <script><![CDATA[ +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.Event; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import java.util.Collection; +import java.util.HashSet; + +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; + +private final static int DEFAULT_WIDTH = 150; + +private final static int DEFAULT_HEIGHT = 150; + +protected Collection<MatrixPanelListener> matrixPanelListeners = new HashSet<MatrixPanelListener>(); + +protected MatrixPopupMenu popupMenu = null; + +protected MatrixND matrix = null; + +initObject(); + +public MatrixPanelEditor(MatrixND m, boolean dimensionEdit) { + this(dimensionEdit, DEFAULT_WIDTH, DEFAULT_HEIGHT); + matrix = m; +} + +public MatrixPanelEditor(boolean dimensionEdit, int width, int height) { + this.dimensionEdit = dimensionEdit; + setPreferredSize(new Dimension(width, height)); +} + +public MatrixPanelEditor(boolean dimensionEdit) { + this(dimensionEdit, DEFAULT_WIDTH, DEFAULT_HEIGHT); +} + +public void setMatrix(MatrixND m){ + this.matrix = m; + initObject(); +} + +public MatrixND getMatrix() { + return matrix; +} + +protected MatrixFactory getFactory() { + return MatrixFactory.getInstance(); +} + +public void addMatrixPanelListener(MatrixPanelListener l) { + matrixPanelListeners.add(l); +} + +public void removeMatrixPanelListener(MatrixPanelListener l) { + matrixPanelListeners.remove(l); +} + +protected void initObject() { + if (getMatrix() == null) { + editArea.setViewportView(null); + } + else { + popupMenu = new MatrixPopupMenu(this); + table = new JTable() { + public void processMouseEvent(MouseEvent event) { + if (event.isPopupTrigger()) { + popupMenu.show(event.getComponent(), event.getX(), event.getY()); + } + super.processMouseEvent(event); + } + }; + + table.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_C, Event.CTRL_MASK),"copy"); + table.getActionMap().put("copy",popupMenu.getSendToClipBoardSelectionCopyAction()); + table.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_V, Event.CTRL_MASK),"paste"); + table.getActionMap().put("paste",popupMenu.getSendToClipBoardCurrentPasteAction()); + if (isLinearModel()) { + setTableModel(new MatrixTableModelLinear(getMatrix(), isLinearModelShowDefault())); + } + else { + setTableModel(new MatrixTableModelND(getMatrix())); + } + + getTableModel().addTableModelListener(new TableModelListener() { + @Override + public void tableChanged(TableModelEvent e) { + fireEvent(); + } + }); + + table.setModel(getTableModel()); + table.setDefaultRenderer(String.class, tableModel.getMatrixCellRenderer()); + table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); + table.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION); + editArea.setViewportView(table); + } + repaint(); +} + +protected void btnAction() { + String dim; + dim = JOptionPane.showInputDialog(null, _("nuitonmatrix.create.matrix.message"), _("nuitonmatrix.create.matrix.title"), JOptionPane.DEFAULT_OPTION); + + if (dim != null) { + String[] sdim = dim.split(";"); + int[] idim = new int[sdim.length]; + for (int i = 0; i < idim.length; i++) { + idim[i] = Integer.parseInt(sdim[i]); + } + setMatrix(getFactory().create(idim)); + } +} + +protected void fireEvent() { + MatrixPanelEvent e = new MatrixPanelEvent(this); + for (MatrixPanelListener matrixPanelListener : matrixPanelListeners) { + matrixPanelListener.matrixChanged(e); + } +} + ]]> + </script> + <JScrollPane id='editArea' constraints='BorderLayout.CENTER'> + <JTable id='table' autoResizeMode='{JTable.AUTO_RESIZE_OFF}' cellSelectionEnabled='{true}' selectionMode='{ListSelectionModel.SINGLE_INTERVAL_SELECTION}'/> + </JScrollPane> + <JButton id='buttonEdit' text='nuitonmatrix.create.matrix.button' visible='{isDimensionEdit()}' + onActionPerformed='btnAction()' constraints='BorderLayout.SOUTH'/> +</MatrixEditor>

1 0

r199 - trunk/src/main/java/org/nuiton/math/matrix
by echatellier＠users.nuiton.org 04 Nov '09

04 Nov '09

Author: echatellier Date: 2009-11-04 15:22:06 +0100 (Wed, 04 Nov 2009) New Revision: 199 Modified: trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java Log: Move equals debug to trace (very, very, very verbose) Modified: trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2009-11-04 10:10:26 UTC (rev 198) +++ trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2009-11-04 14:22:06 UTC (rev 199) @@ -482,10 +482,9 @@ double v1 = i.getValue(); double v2 = getValue(i.getCoordinates()); result = v1 == v2; - if (log.isDebugEnabled()) { - log.debug("v1(" + v1 + ")==v2(" + v2 + ")=" + result); + if (log.isTraceEnabled()) { + log.trace("v1(" + v1 + ")==v2(" + v2 + ")=" + result); } - // System.out.println("v1("+v1+")==v2("+v2+ ")="+result); } return result;

1 0

r198 - trunk/src/main/java/org/nuiton/math/matrix
by echatellier＠users.nuiton.org 04 Nov '09

04 Nov '09

Author: echatellier Date: 2009-11-04 11:10:26 +0100 (Wed, 04 Nov 2009) New Revision: 198 Modified: trunk/src/main/java/org/nuiton/math/matrix/MatrixFactory.java Log: Remove old lutinxml comments Modified: trunk/src/main/java/org/nuiton/math/matrix/MatrixFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/MatrixFactory.java 2009-11-02 11:11:40 UTC (rev 197) +++ trunk/src/main/java/org/nuiton/math/matrix/MatrixFactory.java 2009-11-04 10:10:26 UTC (rev 198) @@ -35,65 +35,6 @@ */ public class MatrixFactory { // MatrixFactory - /* following code in only an exception generator since - * lutinxml in not used anymore :) - static { - - // on essai d'enregistrer le converter XML - try { - // Il faut le faire par pur introspection sinon l'exception - // NoClassDefFoundError est levé avant d'entrer dans le constructeur - // static :( - Class converterClass = Class - .forName("org.codelutin.math.matrix.MatrixNDXMLConverter"); - Object converter = converterClass.newInstance(); - - Class converterFactoryClass = Class - .forName("org.codelutin.xml.XMLConverterFactory"); - Method m = converterFactoryClass.getMethod("addConverter", - Class.class, Class - .forName("org.codelutin.xml.XMLConverter")); - m.invoke(null, MatrixND.class, converter); - - // org.codelutin.xml.XMLConverterFactory.addConverter(MatrixND.class, - // new MatrixNDXMLConverter()); - log.info("Converter XML pour MatrixND ajoute"); - - // on essai d'enregistrer le converter JDBC - // le JDBC depend du XML - try { - converterClass = Class - .forName("org.codelutin.math.matrix.MatrixNDJDBCConverter"); - converter = converterClass.newInstance(); - - converterFactoryClass = Class - .forName("org.codelutin.topia.persistence.jdbctransformer.JDBCTransformerFactory"); - m = converterFactoryClass - .getMethod( - "addConverter", - Class.class, - Class.forName("org.codelutin.topia.persistence.jdbctransformer.JDBCTransformer")); - m.invoke(null, MatrixND.class, converter); - - // Class converterClass = - // org.codelutin.math.matrix.MatrixNDJDBCConverter(); - // JDBCTransformerFactory - // .addConverter(MatrixND.class, new MatrixNDJDBCConverter()); - log.info("Converter JDBC pour MatrixND ajoute"); - } catch (Throwable eee) { - log - .info("librairie topia non presente. Import/Export JDBC impossible"); - log.debug("L'exception etait", eee); - } - - } catch (Throwable eee) { - log - .info("librairie lutinxml non presente. Import/Export XML impossible"); - log.debug("L'exception etait", eee); - } - - }*/ - /** Valeur par defaut si aucun type de Vector n'est donné */ protected static Class<?> defaultVectorClass = DoubleBigVector.class; @@ -138,10 +79,8 @@ /** * Convert a double array into matrix. * - * @param values - * The values to fill the matrix - * @param dim - * An array representing the dimensions of the matrix + * @param values The values to fill the matrix + * @param dim An array representing the dimensions of the matrix * @return a 2D matrix filled with the values, null if the dimension is more * than 2 */ @@ -198,8 +137,7 @@ * Crée une nouvelle matrice identité. Une matrice identité est une matrice * à 2 dimensions dont tous les éléments de la diagonal vaut 1 * - * @param size - * la taille de la matrice + * @param size la taille de la matrice * @return une nouvelle matrice identité */ public MatrixND matrixId(int size) { @@ -221,4 +159,3 @@ } } // MatrixFactory -

1 0

r197 - in trunk: . src/main/java/org/nuiton/math/matrix/gui
by echatellier＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: echatellier Date: 2009-11-02 12:11:40 +0100 (Mon, 02 Nov 2009) New Revision: 197 Modified: trunk/changelog.txt trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java Log: Affiche la traduction des dimensions. Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-11-02 10:32:05 UTC (rev 196) +++ trunk/changelog.txt 2009-11-02 11:11:40 UTC (rev 197) @@ -1,3 +1,6 @@ +ver-2.0.1 chatellier + * Display translated column names (i18n) + ver-2.0 chatellier * rename some methods (make originals deprecated) * add generics Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java 2009-11-02 10:32:05 UTC (rev 196) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java 2009-11-02 11:11:40 UTC (rev 197) @@ -17,6 +17,8 @@ package org.nuiton.math.matrix.gui; +import static org.nuiton.i18n.I18n._; + import java.awt.Color; import java.awt.Component; import java.awt.Font; @@ -188,14 +190,18 @@ } - /* - * @see javax.swing.table.AbstractTableModel#getColumnName(int) + /** + * {@inheritDoc} + * + * Return column names. + * Try to return i18n column names if possible. */ @Override public String getColumnName(int column) { String result = null; if (column < m.getDimCount()) { - result = m.getDimensionName(column); + String columnName = m.getDimensionName(column); + result = _(columnName); } else { result = ""; } Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java 2009-11-02 10:32:05 UTC (rev 196) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java 2009-11-02 11:11:40 UTC (rev 197) @@ -17,6 +17,8 @@ package org.nuiton.math.matrix.gui; +import static org.nuiton.i18n.I18n._; + import java.awt.Color; import java.awt.Component; import java.awt.Font; @@ -145,16 +147,25 @@ return result; } + /** + * Get value. + * + * Return column name (i18n if possible) for bounded values. + * + * @param row row + * @param col column + * @return value + */ protected Object getValue(int row, int col) { Object result = null; if (row < addRow && col < addCol) { if (row == addRow - 1 && col == addCol - 1) { - result = m.getDimensionName(col * 2) + "\\" - + m.getDimensionName(row * 2 + 1); + result = _(m.getDimensionName(col * 2)) + "\\" + + _(m.getDimensionName(row * 2 + 1)); } else if (row == addRow - 1) { - result = m.getDimensionName(col * 2); + result = _(m.getDimensionName(col * 2)); } else if (col == addCol - 1) { - result = m.getDimensionName(row * 2 + 1); + result = _(m.getDimensionName(row * 2 + 1)); } else { result = ""; }

1 0

r196 - trunk
by echatellier＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: echatellier Date: 2009-11-02 11:32:05 +0100 (Mon, 02 Nov 2009) New Revision: 196 Modified: trunk/pom.xml Log: i18n was not parsing jaxx generated files Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 09:57:44 UTC (rev 195) +++ trunk/pom.xml 2009-11-02 10:32:05 UTC (rev 196) @@ -153,6 +153,13 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> + <configuration> + <entries> + <entry> + <basedir>${project.build.directory}/generated-sources/java/</basedir> + </entry> + </entries> + </configuration> <executions> <execution> <goals>

1 0

r195 - trunk/src/main/java/org/nuiton/math/matrix/gui
by echatellier＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: echatellier Date: 2009-11-02 10:57:44 +0100 (Mon, 02 Nov 2009) New Revision: 195 Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java Log: Not valid todo Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java 2009-11-02 09:54:02 UTC (rev 194) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java 2009-11-02 09:57:44 UTC (rev 195) @@ -38,9 +38,6 @@ * Extension de AbstractTableModel pour definir un TableModel avec une * MatrixND comme support d'information. * - * TODO changer les 'matrice' en 'matrix', s'il y a des methodes public - * avec les nom 'matice' les laisser mais les mettres depreciées - * * Created: 21 mars 2006 19:01:27 * * @author poussin

1 0

r194 - trunk/src/main/java/org/nuiton/math/matrix/gui
by echatellier＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: echatellier Date: 2009-11-02 10:54:02 +0100 (Mon, 02 Nov 2009) New Revision: 194 Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/JAXXMatrixEditor.jaxx Log: Untranslated strings ? Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/JAXXMatrixEditor.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/JAXXMatrixEditor.jaxx 2009-11-02 08:11:04 UTC (rev 193) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/JAXXMatrixEditor.jaxx 2009-11-02 09:54:02 UTC (rev 194) @@ -149,7 +149,7 @@ protected void btnAction(){ String dim; - dim = JOptionPane.showInputDialog(null, I18n._("lutinmatrix.create.matrix.message"), I18n._("lutinmatrix.create.matrix.title"), JOptionPane.DEFAULT_OPTION); + dim = JOptionPane.showInputDialog(null, I18n._("nuitonmatrix.create.matrix.message"), I18n._("nuitonmatrix.create.matrix.title"), JOptionPane.DEFAULT_OPTION); if (dim != null) { String[] sdim = dim.split(";"); @@ -173,6 +173,6 @@ <JScrollPane id='editArea' constraints='BorderLayout.CENTER'> <JTable id='table' autoResizeMode='{JTable.AUTO_RESIZE_OFF}' cellSelectionEnabled='{true}' selectionMode='{ListSelectionModel.SINGLE_INTERVAL_SELECTION}'/> </JScrollPane> - <JButton id='buttonEdit' text='lutinmatrix.create.matrix.button' visible='{isDimensionEdit()}' + <JButton id='buttonEdit' text='nuitonmatrix.create.matrix.button' visible='{isDimensionEdit()}' onActionPerformed='btnAction()' constraints='BorderLayout.SOUTH'/> </MatrixEditor>

1 0

r193 - branches/nuiton-matrix-2.1.x
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 09:11:04 +0100 (Mon, 02 Nov 2009) New Revision: 193 Modified: branches/nuiton-matrix-2.1.x/pom.xml Log: svn ignore idea files Modified: branches/nuiton-matrix-2.1.x/pom.xml =================================================================== --- branches/nuiton-matrix-2.1.x/pom.xml 2009-11-02 08:08:55 UTC (rev 192) +++ branches/nuiton-matrix-2.1.x/pom.xml 2009-11-02 08:11:04 UTC (rev 193) @@ -119,7 +119,6 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> <executions> <execution> <goals> @@ -154,7 +153,6 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>${i18n.version}</version> <executions> <execution> <goals> @@ -171,6 +169,18 @@ <plugins> <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxx.version}</version> + </plugin> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${i18n.version}</version> + </plugin> + + <plugin> <artifactId>maven-site-plugin</artifactId> <dependencies> <dependency>

1 0

r192 - trunk
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 09:08:55 +0100 (Mon, 02 Nov 2009) New Revision: 192 Modified: trunk/ Log: svn ignore idea files Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target .settings .classpath .project lutinmatrix.ipr lutinmatrix.iml bin + target .settings .classpath .project *.ipr *.iml bin

1 0