February 2008 - Simexplorer-si-commits - mailman.cloud.codelutin.com

r1095 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 23:03:19 +0000 (Mon, 18 Feb 2008) New Revision: 1095 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java Log: am?\195?\169lioration mecanisme de synch Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java 2008-02-18 23:02:54 UTC (rev 1094) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java 2008-02-18 23:03:19 UTC (rev 1095) @@ -21,14 +21,11 @@ import fr.cemagref.simexplorer.is.entities.data.DataEntity; import fr.cemagref.simexplorer.is.entities.data.ExplorationData; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.ui.SimExplorerContext; import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; - /** * Le model d'un meta sélectionné dans un onglet * @@ -46,31 +43,26 @@ /** la version de l'élément sélectionné */ protected Version version; - /** flag pour indiquer si on veut avoir le resultat */ - protected Boolean result; + /** le type de l'entity encapsulée */ + protected transient EntityHelper.Type type; - protected EntityHelper.Type type; - /** l'objet selectionne */ - protected DataEntity data; + protected transient DataEntity data; - /** l'objet selectionne */ - protected MetaData meta; + /** les meta du le selectionne */ + protected transient MetaData meta; /** l'objet selectionne ou son le */ - protected LoggableElement le; + protected transient LoggableElement le; - /** support pourles changements des propriétés */ - protected PropertyChangeSupport changeSupport; - private static final long serialVersionUID = 7391453280198510606L; + private static final long serialVersionUID = -6047191988584875688L; - public boolean isRemote() { return remote != null && remote; } - public boolean isResult() { - return result != null && result; + public boolean isResult() { + return type != null && type == EntityHelper.Type.Result; } public String getUuid() { @@ -82,6 +74,7 @@ } public MetaData getMeta() { + //TODO should seek meta if null... return meta; } @@ -92,34 +85,17 @@ if (le != null) { return le; } + resetData(); + // acquire it le = StorageServiceHelper.getElement(context, isRemote(), uuid, version.toString()); - if (le == null) { - type = null; - data = null; - } else { + if (le != null) { meta = le.getMetaData(); } return le; } - public void setMeta(MetaData meta) { - this.meta = meta; - } - - public void setLe(LoggableElement le) { - this.le = le; - } - - public void setData(DataEntity data) { - this.data = data; - } - - public void setType(EntityHelper.Type type) { - this.type = type; - } - /** * Getter of selected real object (LoggableElement or Result). * <p/> @@ -136,21 +112,22 @@ return data; } + // always reset thoses values, before recomputing them + resetData(); + // acquire loggableElement le = getLe(context); if (le == null) { - type = null; - data = null; - result=null; return null; } + // compute type of data type = EntityHelper.Type.valueOf(le.getMetaData().getType()); - setResult(EntityHelper.Type.Result == type); // compute real data selected if (type.isLe()) { + meta = le.getMetaData(); return data = le; } if (isResult()) { @@ -160,21 +137,69 @@ throw new IllegalStateException("can not find DataEntity for " + this + " and le:" + le); } - public void synch(boolean remote, String uuid, Version version) { + public void synch(EntityTreeNode node) { + if (node == null) { + synch(remote, null, null); + return; + } + if (node.isResult()) { + EntityTreeNode parent = (EntityTreeNode) node.getParent(); + LoggableElement selectedElement = parent.getLoggableElement(); + synch(node.isRemote(), selectedElement); + setType(EntityHelper.Type.Result); + setData((DataEntity) node.get()); + } else { + synch(node.isRemote(), node.getLoggableElement()); + } + } + + public void synch(Boolean remote, LoggableElement le) { + if (le == null) { + synch(remote, (MetaData) null); + } else { + synch(remote, le.getMetaData()); + } + setLe(le); + } + + public void synch(Boolean remote, MetaData data) { + if (data == null) { + synch(remote, null, null); + } else { + synch(remote, data.getUuid(), data.getVersion()); + EntityHelper.Type type = EntityHelper.Type.valueOf(data.getType()); + setType(type); + } + setMeta(data); + } + + public void synch(Boolean remote, String uuid, Version version) { reset(); setRemote(remote); setUuid(uuid); setVersion(version); } - public void setRemote(boolean remote) { - this.remote = remote; + public void setLe(LoggableElement le) { + this.le = le; } - public void setResult(Boolean result) { - this.result = result; + public void setData(DataEntity data) { + this.data = data; } + public void setMeta(MetaData meta) { + this.meta = meta; + } + + public void setType(EntityHelper.Type type) { + this.type = type; + } + + public void setRemote(boolean remote) { + this.remote = remote; + } + public void setUuid(String uuid) { this.uuid = uuid; } @@ -187,73 +212,34 @@ remote = null; uuid = null; version = null; - result = null; + resetData(); + } + + protected void resetData() { le = null; type = null; data = null; + meta = null; } @Override public String toString() { String s = super.toString(); - return s.substring(s.indexOf('@')) + "<remote:" + remote + ", uuid:" + uuid + - ", version:" + version + ", result:" + result + ", type:" + + return s.substring(s.lastIndexOf('.')+1) + "<remote:" + remote + ", uuid:" + uuid + + ", version:" + version + ", result:" + isResult() + ", type:" + type + ">"; } + public DataEntityModel cloneSafe() { + try { + return clone(); + } catch (CloneNotSupportedException e) { + return null; + } + } + @Override public DataEntityModel clone() throws CloneNotSupportedException { return (DataEntityModel) super.clone(); } - - public synchronized void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { - if (listener == null) { - return; - } - if (changeSupport == null) { - changeSupport = new PropertyChangeSupport(this); - } - changeSupport.addPropertyChangeListener(propertyName, listener); - } - - public synchronized void addPropertyChangeListener(PropertyChangeListener listener) { - if (listener == null) { - return; - } - if (changeSupport == null) { - changeSupport = new PropertyChangeSupport(this); - } - changeSupport.addPropertyChangeListener(listener); - } - - public synchronized void removePropertyChangeListener(PropertyChangeListener listener) { - if (listener == null || changeSupport == null) { - return; - } - changeSupport.removePropertyChangeListener(listener); - } - - public synchronized void removePropertyChangeListeners() { - if (changeSupport == null) { - return; - } - for (PropertyChangeListener listener : getPropertyChangeListeners()) { - changeSupport.removePropertyChangeListener(listener); - } - } - - public synchronized PropertyChangeListener[] getPropertyChangeListeners() { - if (changeSupport == null) { - return new PropertyChangeListener[0]; - } - return changeSupport.getPropertyChangeListeners(); - } - - public void firePropertyChange(String propertyName, Object oldValue, Object newValue) { - if (changeSupport == null || (oldValue == null && newValue == null) || - (oldValue != null && oldValue.equals(newValue))) { - return; - } - changeSupport.firePropertyChange(propertyName, oldValue, newValue); - } } \ No newline at end of file

1 0

r1094 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 23:02:54 +0000 (Mon, 18 Feb 2008) New Revision: 1094 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SimExplorerTabModel.java Log: ajout methodes de synch Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SimExplorerTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SimExplorerTabModel.java 2008-02-18 23:02:34 UTC (rev 1093) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SimExplorerTabModel.java 2008-02-18 23:02:54 UTC (rev 1094) @@ -17,7 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.model; -import fr.cemagref.simexplorer.is.entities.EntityHelper; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; @@ -55,42 +54,22 @@ } public boolean isRemote() { - return remote; + return remote != null && remote; } public void synch(EntityTreeNode node) { - if (node == null) { - synch(remote, null, null); - return; - } - LoggableElement selectedElement; - if (node.isResult()) { - EntityTreeNode parent = (EntityTreeNode) node.getParent(); - selectedElement = parent.getLoggableElement(); - synch(node.isRemote(), selectedElement); - getSelectedItem().setType(EntityHelper.Type.Result); - } else { - selectedElement = node.getLoggableElement(); - synch(node.isRemote(), selectedElement); - } + this.remote = node == null ? null : node.isRemote(); + getSelectedItem().synch(node); } public void synch(Boolean remote, LoggableElement selectedElement) { - if (selectedElement == null) { - synch(remote, null, null); - return; - } - synch(remote, selectedElement.getMetaData()); - getSelectedItem().setLe(selectedElement); + this.remote = remote; + getSelectedItem().synch(remote, selectedElement); } public void synch(Boolean remote, MetaData selectedMeta) { - if (selectedMeta == null) { - synch(remote, null, null); - return; - } - synch(remote, selectedMeta.getUuid(), selectedMeta.getVersion()); - getSelectedItem().setMeta(selectedMeta); + this.remote = remote; + getSelectedItem().synch(remote, selectedMeta); } public void synch(Boolean remote, String uuid, Version version) {

1 0

r1093 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 23:02:34 +0000 (Mon, 18 Feb 2008) New Revision: 1093 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java Log: unused import Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java 2008-02-18 23:01:34 UTC (rev 1092) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java 2008-02-18 23:02:34 UTC (rev 1093) @@ -28,7 +28,6 @@ import javax.swing.JTabbedPane; import javax.swing.JPopupMenu; import java.awt.Component; -import java.awt.Container; /** * La défintion des onglets utilisés dans l'application

1 0

r1092 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 23:01:34 +0000 (Mon, 18 Feb 2008) New Revision: 1092 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/PaginationModel.java Log: fix bug on pagination nbPages computation. little things... Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-18 21:04:30 UTC (rev 1091) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-18 23:01:34 UTC (rev 1092) @@ -153,8 +153,7 @@ protected Integer getVersionIndex(Version version) { if (versions != null && version != null) { for (int i = 0; i < versions.length; i++) { - Version version1 = versions[i]; - if (version1.equals(version)) { + if (versions[i].equals(version)) { return i; } } @@ -180,8 +179,8 @@ public void resetSelectedNode() { selectedNode = null; versions = null; - resetSelectedVersion(); detail = null; + resetSelectedVersion(); } public void resetSelectedVersion() { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-18 21:04:30 UTC (rev 1091) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-18 23:01:34 UTC (rev 1092) @@ -138,8 +138,7 @@ } protected PaginationModel initPagination(SimExplorerContext context) { - QueryModel queryModel; - queryModel = getQuery(); + QueryModel queryModel = getQuery(); String query = queryModel.getQuery(); // get size list Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/PaginationModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/PaginationModel.java 2008-02-18 21:04:30 UTC (rev 1091) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/PaginationModel.java 2008-02-18 23:01:34 UTC (rev 1092) @@ -50,6 +50,12 @@ return size - firstIndex > width; } + @Override + public String toString() { + String s = super.toString(); + return s.substring(s.indexOf('@')) + "<size:" + size + ", firstIndex:" + firstIndex + ", width:" + width + ", nbPages:" + getNbPages() + ">"; + } + public boolean hasPrevious() { return firstIndex >= width; } @@ -63,8 +69,8 @@ } public int getNbPages() { - int nbPages = (int) (size / width); - if (nbPages==0 && size>0) { + int nbPages = (int) (size / width); + if ((size%width!=0) || (nbPages == 0 && size > 0)) { nbPages++; } return nbPages;

1 0

r1091 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 21:04:30 +0000 (Mon, 18 Feb 2008) New Revision: 1091 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java Log: on supprime les ?\195?\169tats des action showTab_synchronize et showTab_detail, ces actions trouveront quoi faire toute seules :) Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-18 21:03:59 UTC (rev 1090) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-18 21:04:30 UTC (rev 1091) @@ -85,6 +85,14 @@ if (!super.beforeAction(e)) { return false; } + if (selected == null) { + // on doit retrouver l'élément à traiter à partir de la source + selected = findSelectedItem(e); + } + boolean selectedUuid = selected != null && selected.getUuid() != null; + if (!selectedUuid) { + return false; + } // préparation du modèle de détail DetailTabModel detailModel = (DetailTabModel) SimExplorerTab.detail.getModel(); @@ -102,10 +110,6 @@ return element != null; } - public void setSelected(DataEntityModel selected) { - this.selected = selected; - } - protected void initFirstUsage(final JDetailTab ui, final DetailTabModel model) { // add a listener on navigation tree ui.getNavigationTree().addTreeSelectionListener(navigationListener);

1 0

r1090 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 21:03:59 +0000 (Mon, 18 Feb 2008) New Revision: 1090 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToLocalAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToRemoteAction.java Log: on supprime les ?\195?\169tats des action showTab_synchronize et showTab_detail, ces actions trouveront quoi faire toute seules :) Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToLocalAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToLocalAction.java 2008-02-18 21:03:18 UTC (rev 1089) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToLocalAction.java 2008-02-18 21:03:59 UTC (rev 1090) @@ -69,7 +69,6 @@ super.updateUI(); // reinit de l'onglet synchronize ShowSynchronizeTabAction synchronizeAction = (ShowSynchronizeTabAction) SimExplorerActionManager.newAction("showTab_synchronize", (AbstractButton) null); - synchronizeAction.setSelected(getModel().getSelectedItem()); synchronizeAction.actionPerformed((new ActionEvent(e.getSource(), ActionEvent.ACTION_FIRST, "showTab_synchronize"))); } } \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToRemoteAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToRemoteAction.java 2008-02-18 21:03:18 UTC (rev 1089) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToRemoteAction.java 2008-02-18 21:03:59 UTC (rev 1090) @@ -69,7 +69,6 @@ super.updateUI(); // reinit de l'onglet synchronize ShowSynchronizeTabAction synchronizeAction = (ShowSynchronizeTabAction) SimExplorerActionManager.newAction("showTab_synchronize", (AbstractButton) null); - synchronizeAction.setSelected(getModel().getSelectedItem()); synchronizeAction.actionPerformed((new ActionEvent(e.getSource(), ActionEvent.ACTION_FIRST, "showTab_synchronize"))); } } \ No newline at end of file

1 0

r1089 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 21:03:18 +0000 (Mon, 18 Feb 2008) New Revision: 1089 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java Log: on supprime les ?\195?\169tats des action showTab_synchronize et showTab_detail, ces actions trouveront quoi faire toute seules :) Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-18 21:01:33 UTC (rev 1088) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-18 21:03:18 UTC (rev 1089) @@ -23,8 +23,6 @@ import fr.cemagref.simexplorer.is.ui.swing.JListTab; import fr.cemagref.simexplorer.is.ui.swing.ListTabRefreshHelper; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; -import fr.cemagref.simexplorer.is.ui.swing.actions.ShowDetailTabAction; -import fr.cemagref.simexplorer.is.ui.swing.actions.ShowSynchronizeTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel; @@ -50,12 +48,6 @@ /** flag pour indiquer si la liste est locale ou remote */ protected boolean remote; - /** l'action d'affichage de l'onglet de détail */ - ShowDetailTabAction detailAction; - - /** l'action d'affichage de l'onglet synchronisation */ - ShowSynchronizeTabAction synchronizeAction; - ListMetaSelectionListener listMetaSelectionListener; public ShowListTabAbstractAction(String name, boolean remote) { @@ -74,13 +66,11 @@ tabbedPane.setSelectedComponent(ui); return false; } - + return true; } protected void initFirstUsage(final JListTab ui, final ListTabModel model) { - detailAction = (ShowDetailTabAction) SimExplorerActionManager.newAction("showTab_detail", (AbstractButton) null); - synchronizeAction = (ShowSynchronizeTabAction) SimExplorerActionManager.newAction("showTab_synchronize", (AbstractButton) null); MetaData[] data = model.getList(); if (data == null) { @@ -119,8 +109,9 @@ try { // synchronization du meta selectionne synchSelected(ui, getRowAtPoint(ui, e.getPoint()), ui.getTable().getSelectionModel(), model); - // lancement de l'action d'affichage du tab - detailAction.actionPerformed(new ActionEvent(e.getSource(), ActionEvent.ACTION_FIRST, "showTab_detail")); + // lancement de l'action d'affichage de l'onglet de detail + ActionEvent e1 = new ActionEvent(e.getSource(), ActionEvent.ACTION_FIRST, "showTab_detail"); + SimExplorerActionManager.newAction("showTab_detail", (AbstractButton) null).actionPerformed(e1); } catch (Exception e1) { throw new SimExplorerRuntimeException(e1); } @@ -183,9 +174,6 @@ log.info(entityModel); ListTabRefreshHelper.refreshListTablePopupMenu(ui, model); } - entityModel = model.getSelectedItem(); - detailAction.setSelected(entityModel); - synchronizeAction.setSelected(entityModel); } protected int getRowAtPoint(JListTab ui, Point e) {

1 0

r1088 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 21:01:33 +0000 (Mon, 18 Feb 2008) New Revision: 1088 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SimExplorerTabModel.java Log: on passe en Boolean (pour accepter les cas null) Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SimExplorerTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SimExplorerTabModel.java 2008-02-18 21:01:12 UTC (rev 1087) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SimExplorerTabModel.java 2008-02-18 21:01:33 UTC (rev 1088) @@ -75,7 +75,7 @@ } } - public void synch(boolean remote, LoggableElement selectedElement) { + public void synch(Boolean remote, LoggableElement selectedElement) { if (selectedElement == null) { synch(remote, null, null); return; @@ -84,7 +84,7 @@ getSelectedItem().setLe(selectedElement); } - public void synch(boolean remote, MetaData selectedMeta) { + public void synch(Boolean remote, MetaData selectedMeta) { if (selectedMeta == null) { synch(remote, null, null); return; @@ -93,7 +93,7 @@ getSelectedItem().setMeta(selectedMeta); } - public void synch(boolean remote, String uuid, Version version) { + public void synch(Boolean remote, String uuid, Version version) { this.remote = remote; getSelectedItem().synch(remote, uuid, version); }

1 0

r1087 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 21:01:12 +0000 (Mon, 18 Feb 2008) New Revision: 1087 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java Log: methode pour trouver l'?\195?\169l?\195?\169ment ?\195?\160 traiter ?\195?\160 partir d'un ?\195?\169v?\195?\168nement d'action Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java 2008-02-18 21:00:38 UTC (rev 1086) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java 2008-02-18 21:01:12 UTC (rev 1087) @@ -19,9 +19,9 @@ package fr.cemagref.simexplorer.is.ui.swing.actions.util; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; +import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; import fr.cemagref.simexplorer.is.ui.swing.model.SimExplorerTabModel; import jaxx.runtime.JAXXObject; -import jaxx.runtime.builder.TabModel; import jaxx.runtime.swing.JAXXTab; import org.apache.commons.beanutils.Converter; import org.codelutin.i18n.I18n; @@ -30,6 +30,7 @@ import javax.swing.JComponent; import javax.swing.JTabbedPane; import java.awt.Component; +import java.awt.event.ActionEvent; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -120,4 +121,23 @@ protected boolean isRemote() { return getTab() == SimExplorerTab.remote; } + + protected DataEntityModel findSelectedItem(ActionEvent e) { + SimExplorerTab sourceTab = SimExplorerTab.findTab((Component) e.getSource()); + log.info("incoming tab " + sourceTab); + if (sourceTab == null) { + //fatal error + log.warn("could not find a tab for source " + e.getSource()); + return null; + } + DataEntityModel entityModel = sourceTab.getModel().getSelectedItem(); + if (entityModel!=null) { + try { + entityModel = entityModel.clone(); + } catch (CloneNotSupportedException e1) { + e1.printStackTrace(); + } + } + return entityModel; + } }

1 0

r1086 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 21:00:38 +0000 (Mon, 18 Feb 2008) New Revision: 1086 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java Log: model clonable Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java 2008-02-18 19:16:47 UTC (rev 1085) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java 2008-02-18 21:00:38 UTC (rev 1086) @@ -35,7 +35,7 @@ * @author chemit * @see DataEntity */ -public class DataEntityModel implements java.io.Serializable { +public class DataEntityModel implements java.io.Serializable, Cloneable { /** flag pour savoir si la source est remote ou non */ protected Boolean remote; @@ -98,6 +98,8 @@ if (le == null) { type = null; data = null; + } else { + meta = le.getMetaData(); } return le; } @@ -193,11 +195,17 @@ @Override public String toString() { - return super.toString() + "<remote:" + remote + ", uuid:" + uuid + + String s = super.toString(); + return s.substring(s.indexOf('@')) + "<remote:" + remote + ", uuid:" + uuid + ", version:" + version + ", result:" + result + ", type:" + type + ">"; } + @Override + public DataEntityModel clone() throws CloneNotSupportedException { + return (DataEntityModel) super.clone(); + } + public synchronized void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { if (listener == null) { return;

1 0