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

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

11 Feb '08

Author: tchemit Date: 2008-02-11 20:35:28 +0000 (Mon, 11 Feb 2008) New Revision: 825 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java Log: ajout action de synchronisation sur l'onglet de liste d'elements 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-11 20:33:40 UTC (rev 824) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-11 20:35:28 UTC (rev 825) @@ -81,9 +81,10 @@ } protected void initFirstUsage(final JApplicationListTab ui, final ListTabModel model) { - ui.getDeleteLoggableElement().setHideActionText(false); - ui.getDownloadLoggableElement().setHideActionText(false); - ui.getExportApplication().setHideActionText(false); + ui.getLaunchSynchronize().setHideActionText(false); + ui.getExportElement().setHideActionText(false); + ui.getDownloadElement().setHideActionText(false); + ui.getDeleteElement().setHideActionText(false); ui.getTable().getSelectionModel().addListSelectionListener(new ListSelectionListener() { public void valueChanged(ListSelectionEvent e) {

1 0

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

11 Feb '08

Author: tchemit Date: 2008-02-11 20:33:40 +0000 (Mon, 11 Feb 2008) New Revision: 824 Removed: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ListApplicationsAction.java Log: suppression action inutile Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ListApplicationsAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ListApplicationsAction.java 2008-02-11 20:33:28 UTC (rev 823) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ListApplicationsAction.java 2008-02-11 20:33:40 UTC (rev 824) @@ -1,41 +0,0 @@ -/* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, -* Tony Chemit -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* 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 Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ -package fr.cemagref.simexplorer.is.ui.swing.actions; - -import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; - -/** - * Action pour ??? - * - * @author tony - */ -public class ListApplicationsAction extends SimExplorerAbstractAction { - - private static final long serialVersionUID = 6220034344778635703L; - - public ListApplicationsAction(String name) { - super(name); - } - - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO - } -} \ No newline at end of file

1 0

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

11 Feb '08

Author: tchemit Date: 2008-02-11 20:33:28 +0000 (Mon, 11 Feb 2008) New Revision: 823 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java Log: le model de l'onglet synchronize Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java 2008-02-11 20:33:00 UTC (rev 822) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java 2008-02-11 20:33:28 UTC (rev 823) @@ -1,5 +1,5 @@ /* -* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, * Tony Chemit, Gabriel Landais * * This program is free software; you can redistribute it and/or @@ -15,13 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* \#\#% */ +* ##% */ package fr.cemagref.simexplorer.is.ui.swing.model; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import jaxx.runtime.builder.TabModel; +import java.beans.PropertyChangeListener; + /** * Le model pour un Tab contenant 2 listes d'applications * @@ -34,44 +35,55 @@ /** flag pour savoir si la source est remote ou non */ protected boolean remote; - protected MetaData[] listLocal; - protected MetaData[] listRemote; + /** le model de l'arbre local */ + protected DetailTabModel localModel; + /** le model de l'arbre distant */ + protected DetailTabModel remoteModel; + private static final long serialVersionUID = -3623331875470531459L; public String getName() { return tab.name(); } - public SimExplorerTab getTab() { - return tab; - } - public boolean isRemote() { return remote; } - public MetaData[] getListLocal() { - return listLocal; + public DetailTabModel getLocalModel() { + return localModel; } - public MetaData[] getListRemote() { - return listRemote; + public DetailTabModel getRemoteModel() { + return remoteModel; } public void setName(String name) { this.tab = SimExplorerTab.valueOf(name); } - public void setListLocal(MetaData[] listLocal) { - this.listLocal = listLocal; + public void setRemote(boolean remote) { + this.remote = remote; } - public void setListRemote(MetaData[] listRemote) { - this.listRemote = listRemote; + public synchronized void removePropertyChangeListeners() { + if (localModel!=null) { + localModel.removePropertyChangeListeners(); + } + if (remoteModel!=null) { + remoteModel.removePropertyChangeListeners(); + } } - - public void setRemote(boolean remote) { - this.remote = remote; + public synchronized void addPropertyChangeListener(DetailTabModel.Properties propertyName, PropertyChangeListener listener) { + if (listener == null) { + return; + } + if (localModel!=null) { + localModel.addPropertyChangeListener(propertyName,listener); + } + if (remoteModel!=null) { + remoteModel.addPropertyChangeListener(propertyName,listener); + } } } \ No newline at end of file

1 0

r822 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 11 Feb '08

11 Feb '08

Author: tchemit Date: 2008-02-11 20:33:00 +0000 (Mon, 11 Feb 2008) New Revision: 822 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java Log: grrrr :) modification service getVersions Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-11 20:32:24 UTC (rev 821) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-11 20:33:00 UTC (rev 822) @@ -139,7 +139,7 @@ attachments = loggableElement.getMetaData().getAttachments(); for (Attachment attachment : attachments) { files.put(FILE_DATA_PREFIX + FOLDER_SEPARATOR + attachment.getUniqueId(), - (InputStream) retrieveElementData(token, thisMde.getUuid(), thisMde.getVersion().toString(), attachment)); + retrieveElementData(token, thisMde.getUuid(), thisMde.getVersion().toString(), attachment)); } } PipedInputStream pipedIn = new PipedInputStream(pipedOut); @@ -240,9 +240,16 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#getVersions(java.lang.String, java.lang.String) */ - public MetaData[] getVersions(String token, String uuid) + public Version[] getVersions(String token, String uuid) throws SimExplorerServiceException { - return base.metadatas.get(uuid); + MetaData[] datas = base.metadatas.get(uuid); + + Version[] result = new Version[datas.length]; + for (int i = 0; i < datas.length; i++) { + MetaData data = datas[i]; + result[i] = data.getVersion(); + } + return result; } /* (non-Javadoc)

1 0

r821 - in trunk/simexplorer-is: . doc
by tchemit＠users.labs.libre-entreprise.org 11 Feb '08

11 Feb '08

Author: tchemit Date: 2008-02-11 20:32:24 +0000 (Mon, 11 Feb 2008) New Revision: 821 Added: trunk/simexplorer-is/doc/ trunk/simexplorer-is/doc/CahierClausesTechniquesParticulieres.pdf Log: ajout doc Added: trunk/simexplorer-is/doc/CahierClausesTechniquesParticulieres.pdf =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is/doc/CahierClausesTechniquesParticulieres.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

r820 - in trunk/simexplorer-is: simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by glandais＠users.labs.libre-entreprise.org 11 Feb '08

11 Feb '08

Author: glandais Date: 2008-02-11 18:04:20 +0000 (Mon, 11 Feb 2008) New Revision: 820 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java Log: getVersions returns an array of Version (instead of MetaData) Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-11 17:14:08 UTC (rev 819) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-11 18:04:20 UTC (rev 820) @@ -311,7 +311,7 @@ * @throws SimExplorerServiceException * the sim explorer service exception */ - MetaData[] getVersions(String token, String uuid) + Version[] getVersions(String token, String uuid) throws SimExplorerServiceException; /** Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-11 17:14:08 UTC (rev 819) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-11 18:04:20 UTC (rev 820) @@ -23,8 +23,8 @@ import java.io.InputStream; import java.io.PipedInputStream; import java.io.PipedOutputStream; -import java.rmi.RemoteException; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -39,8 +39,6 @@ import com.healthmarketscience.rmiio.RemoteInputStream; import com.healthmarketscience.rmiio.RemoteInputStreamClient; -import com.healthmarketscience.rmiio.RemoteInputStreamServer; -import com.healthmarketscience.rmiio.SimpleRemoteInputStream; import fr.cemagref.simexplorer.is.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.DataEntity; @@ -67,8 +65,7 @@ * * @return the storage engine * - * @throws SimExplorerStorageException - * the sim explorer storage exception + * @throws SimExplorerStorageException the sim explorer storage exception */ protected abstract StorageEngine getStorageEngine() throws SimExplorerStorageException; @@ -228,15 +225,12 @@ /** * Save element. * - * @param token - * the token - * @param zipStream - * the zip stream + * @param token the token + * @param zipStream the zip stream * * @return the meta data * - * @throws SimExplorerServiceException - * the sim explorer service exception + * @throws SimExplorerServiceException the sim explorer service exception */ private MetaData saveElement(String token, InputStream zipStream) throws SimExplorerServiceException { @@ -298,17 +292,13 @@ /** * Save element. * - * @param token - * the token - * @param xmlFile - * the xml file - * @param attachments - * the attachments + * @param token the token + * @param xmlFile the xml file + * @param attachments the attachments * * @return the meta data * - * @throws Exception - * the exception + * @throws Exception the exception */ private MetaData saveElement(String token, InputStream xmlFile, Map<Attachment, InputStream> attachments) throws Exception { @@ -328,6 +318,18 @@ return elementSaved; } + /** + * Retrieve element data common. + * + * @param token the token + * @param uuid the uuid + * @param version the version + * @param attachment the attachment + * + * @return the input stream + * + * @throws SimExplorerServiceException the sim explorer service exception + */ protected InputStream retrieveElementDataCommon(String token, String uuid, String version, Attachment attachment) throws SimExplorerServiceException { @@ -342,6 +344,17 @@ } } + /** + * Retrieve element xml common. + * + * @param token the token + * @param uuid the uuid + * @param version the version + * + * @return the input stream + * + * @throws SimExplorerServiceException the sim explorer service exception + */ public InputStream retrieveElementXMLCommon(String token, String uuid, String version) throws SimExplorerServiceException { MetaData mde = getMetadata(token, uuid, version); @@ -355,6 +368,17 @@ } + /** + * Retrieve element full common. + * + * @param token the token + * @param uuid the uuid + * @param version the version + * + * @return the input stream + * + * @throws SimExplorerServiceException the sim explorer service exception + */ public InputStream retrieveElementFullCommon(String token, String uuid, String version) throws SimExplorerServiceException { LoggableElement element = getLoggableElement(token, uuid, version); @@ -394,17 +418,13 @@ /** * Real implementation of saveElement. * - * @param token - * the token - * @param idxml - * the idxml - * @param idsattachment - * the idsattachment + * @param token the token + * @param idxml the idxml + * @param idsattachment the idsattachment * * @return the meta data * - * @throws Exception - * the exception + * @throws Exception the exception */ private MetaData saveElement(String token, String idxml, Map<Attachment, String> idsattachment) throws Exception { @@ -466,19 +486,13 @@ /** * Save sub elements. * - * @param token - * the token - * @param idxml - * the idxml - * @param entitiesNode - * the entities node - * @param entityNode - * the entity node - * @param idsattachment - * the idsattachment + * @param token the token + * @param idxml the idxml + * @param entitiesNode the entities node + * @param entityNode the entity node + * @param idsattachment the idsattachment * - * @throws Exception - * the exception + * @throws Exception the exception */ private void saveSubElements(String token, String idxml, String entitiesNode, String entityNode, @@ -509,17 +523,12 @@ /** * Update. * - * @param token - * the token - * @param oldVersion - * the old version - * @param newVersion - * the new version - * @param oldUuid - * the old uuid + * @param token the token + * @param oldVersion the old version + * @param newVersion the new version + * @param oldUuid the old uuid * - * @throws SimExplorerServiceException - * the sim explorer service exception + * @throws SimExplorerServiceException the sim explorer service exception */ protected void update(String token, String oldUuid, Version oldVersion, MetaData newVersion) throws SimExplorerServiceException { @@ -557,13 +566,10 @@ /** * Process version rules. * - * @param token - * the token - * @param metaData - * the meta data + * @param token the token + * @param metaData the meta data * - * @throws Exception - * the exception + * @throws Exception the exception */ protected abstract void processVersionRules(String token, MetaData metaData) throws Exception; @@ -571,12 +577,19 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#getVersions(java.lang.String, java.lang.String) */ - public MetaData[] getVersions(String token, String uuid) + public Version[] getVersions(String token, String uuid) throws SimExplorerServiceException { try { Set<MetaData> versions = getStorageEngine().getElementVersions( - token, uuid); - return versions.toArray(new MetaData[versions.size()]); + token, uuid); + Iterator<MetaData> iterator = versions.iterator(); + Version[] result = new Version[versions.size()]; + int i = 0; + for (MetaData metaData : versions) { + result[i] = metaData.getVersion(); + i++; + } + return result; } catch (SimExplorerStorageException e) { throw new SimExplorerServiceException(e); } Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java 2008-02-11 17:14:08 UTC (rev 819) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java 2008-02-11 18:04:20 UTC (rev 820) @@ -81,8 +81,8 @@ // Version rules if (previousVersion != null) { previousVersion.setLatest(false); - update(token, previousVersion.getUuid(), previousVersion - .getVersion(), previousVersion); +// update(token, previousVersion.getUuid(), previousVersion +// .getVersion(), previousVersion); metaData.setLatest(true); metaData.setVersion(previousVersion.getVersion().incVersion(0) Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-02-11 17:14:08 UTC (rev 819) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-02-11 18:04:20 UTC (rev 820) @@ -135,6 +135,10 @@ Reader reader = new StringReader(element.getDescription()); readers.add(reader); } + Map<String, String> descriptors = element.getDescriptors(); + for (Map.Entry<String, String> descriptor : descriptors.entrySet()) { + readers.add(new StringReader(descriptor.getValue())); + } // Insert element in database database.insertElement(element, readers); @@ -251,8 +255,7 @@ /** * Gets the tmp attachment. * - * @param id - * the id + * @param id the id * * @return the tmp attachment */ Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-02-11 17:14:08 UTC (rev 819) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-02-11 18:04:20 UTC (rev 820) @@ -27,6 +27,7 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; +import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; @@ -35,23 +36,9 @@ */ public class ElementHistory extends ElementPageDetail { - /** - * The Class MetadataVersionComparator. - */ - public class MetadataVersionComparator implements Comparator<MetaData> { - - /* (non-Javadoc) - * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) - */ - public int compare(MetaData arg0, MetaData arg1) { - return arg0.getVersion().compareTo(arg1.getVersion()); - } - - } - /** The versions. */ @Persist - private MetaData[] versions; + private Version[] versions; /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.ui.web.pages.ElementPage#setup(java.lang.String, java.lang.String) @@ -92,8 +79,10 @@ * Gets the versions. * * @return the versions + * + * @throws SimExplorerServiceException the sim explorer service exception */ - public List<TreeNode> getVersions() { + public List<TreeNode> getVersions() throws SimExplorerServiceException { List<TreeNode> nodes = new ArrayList<TreeNode>(); nodes.add(generateNodes()); return nodes; @@ -103,17 +92,19 @@ * Generate nodes. * * @return the tree node + * + * @throws SimExplorerServiceException the sim explorer service exception */ - private TreeNode generateNodes() { - Arrays.sort(versions, new MetadataVersionComparator()); + private TreeNode generateNodes() throws SimExplorerServiceException { + Arrays.sort(versions); TreeNode rootNode = new TreeNode(); rootNode.setType(TreeNode.TYPE_FOLDER); rootNode.setColumns(generateStringArray(getMessages().get( "simexplorer.ui.web.history"))); rootNode.setObject(new Version("")); rootNode.setChildren(new ArrayList<TreeNode>()); - for (MetaData mde : versions) { - insertNode(mde, 0, rootNode); + for (Version version : versions) { + insertNode(version, 0, rootNode); } return rootNode; } @@ -121,50 +112,46 @@ /** * Insert node. * - * @param mde - * the mde - * @param pos - * the pos - * @param parent - * the parent + * @param pos the pos + * @param parent the parent + * @param version the version + * + * @throws SimExplorerServiceException the sim explorer service exception */ - private void insertNode(MetaData mde, int pos, TreeNode parent) { + private void insertNode(Version version, int pos, TreeNode parent) throws SimExplorerServiceException { List<TreeNode> nodes = parent.getChildren(); - if (pos == mde.getVersion().getLength()) { - nodes.add(generateLeaf(mde)); + if (pos == version.getLength()) { + nodes.add(generateLeaf(version)); } else { TreeNode parentNode = null; for (TreeNode treeNode : nodes) { if (getVersion(treeNode).getVersion(pos) != null && getVersion(treeNode).getVersion(pos).equals( - mde.getVersion().getVersion(pos))) { + version.getVersion(pos))) { parentNode = treeNode; } } if (parentNode == null) { - parentNode = generateFolder(mde, pos, parent); + parentNode = generateFolder(version, pos, parent); nodes.add(parentNode); } - insertNode(mde, pos + 1, parentNode); + insertNode(version, pos + 1, parentNode); } } /** * Generate folder. * - * @param mde - * the mde - * @param pos - * the pos - * @param parent - * the parent + * @param pos the pos + * @param parent the parent + * @param version the version * * @return the tree node */ - private TreeNode generateFolder(MetaData mde, int pos, TreeNode parent) { + private TreeNode generateFolder(Version version, int pos, TreeNode parent) { TreeNode node = new TreeNode(); node.setChildren(new ArrayList<TreeNode>()); - Version v = generateVersion(mde.getVersion(), pos); + Version v = generateVersion(version, pos); node.setColumns(generateStringArray(v.toString())); node.setObject(v); node.setType(TreeNode.TYPE_FOLDER); @@ -174,10 +161,8 @@ /** * Generate version. * - * @param version - * the version - * @param pos - * the pos + * @param version the version + * @param pos the pos * * @return the version */ @@ -192,13 +177,16 @@ /** * Generate leaf. * - * @param mde - * the mde + * @param version the version * * @return the tree node + * + * @throws SimExplorerServiceException the sim explorer service exception */ - private TreeNode generateLeaf(MetaData mde) { + private TreeNode generateLeaf(Version version) throws SimExplorerServiceException { TreeNode node = new TreeNode(); + MetaData mde = RemoteStorageService.getStorageService().getMetadata( + getToken(), getMetadata().getUuid(), version.toString()); // FIXME date tostring node.setColumns(generateStringArray(mde.getVersion().toString(), mde .getDescription(), mde.getCreationDate().toString(), mde, @@ -211,8 +199,7 @@ /** * Gets the version. * - * @param treeNode - * the tree node + * @param treeNode the tree node * * @return the version */

1 0

r819 - trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 11 Feb '08

11 Feb '08

Author: tchemit Date: 2008-02-11 17:14:08 +0000 (Mon, 11 Feb 2008) New Revision: 819 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/SimExplorerServiceStream.java Log: les champs non primitifs d'une classe sont toujours initialises ?\195?\160 null Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/SimExplorerServiceStream.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/SimExplorerServiceStream.java 2008-02-11 17:11:27 UTC (rev 818) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/SimExplorerServiceStream.java 2008-02-11 17:14:08 UTC (rev 819) @@ -34,10 +34,10 @@ private static final long serialVersionUID = 1976003275577858320L; /** The ris. */ - private RemoteInputStream ris = null; + private RemoteInputStream ris; /** The bis. */ - private BufferedInputStream bis = null; + private BufferedInputStream bis; /** * Instantiates a new sim explorer service stream. @@ -47,8 +47,7 @@ */ public SimExplorerServiceStream(RemoteInputStream ris) { super(); - this.ris = ris; - this.bis = null; + this.ris = ris; } /**

1 0

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

11 Feb '08

Author: tchemit Date: 2008-02-11 17:11:27 +0000 (Mon, 11 Feb 2008) New Revision: 818 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java Log: il faut supprimer l'instance cachee du dialogue d'erreur, pour permettre le rechargement i18n suite au changement de langue par l'utilisateur Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-02-11 17:09:51 UTC (rev 817) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-02-11 17:11:27 UTC (rev 818) @@ -79,6 +79,7 @@ ui = null; SimExplorerActionManager.resetCache(); ConfigUI.reloadUI(); + errorDialog=null; SimExplorerTab.getFactory().resetCache(); // must remove listener on data model ? DetailTabModel detailModel = ((DetailTabModel) SimExplorerTab.detail.getModel());

1 0

r817 - in trunk/simexplorer-is/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing java/fr/cemagref/simexplorer/is/ui/swing/actions java/fr/cemagref/simexplorer/is/ui/swing/model uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org 11 Feb '08

11 Feb '08

Author: tchemit Date: 2008-02-11 17:09:51 +0000 (Mon, 11 Feb 2008) New Revision: 817 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/SimExplorerUIRefreshHelper.java 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/model/ListTabModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationSynchronizeTab.jaxx Log: mise en place de l'onglet de synchronisation suppression actions non utilises 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-11 17:08:25 UTC (rev 816) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java 2008-02-11 17:09:51 UTC (rev 817) @@ -66,7 +66,7 @@ impl = JApplicationSynchronizeTab.class, parentImpl = JTabbedPane.class, model = SynchronizeTabModel.class, - useToogle = true, + useToogle = false, name = "simexplorer.tab.synchronize", shortDescription = "simexplorer.tab.synchronize.tooltip" )synchronize; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-11 17:08:25 UTC (rev 816) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-11 17:09:51 UTC (rev 817) @@ -107,6 +107,33 @@ }); } + public static void refreshListTablePopupMenu(final JApplicationListTab ui,final ListTabModel model) { + int index = model.getSelectedIndex(); + if (index ==-1) { + // disable popupmenu + ui.getTablePopupMenu().setEnabled(false); + return; + } + ui.getTablePopupMenu().setEnabled(true); + MetaData data = model.get(index); + // récupération de l'uuid à traiter + String uuid = data.getUuid(); + // récupération de la version à traiter + Version version = data.getVersion(); + String text = data.getName() + " [" + data.getVersion() + "]"; + + String tooltip = _("simexplorer.action.downloadLoggableElement.tooltip", text); + updateButton(ui.getDownloadLoggableElement(), true, tooltip); + + tooltip = _("simexplorer.action.deleteLoggableElement.tooltip", text); + updateButton(ui.getDeleteLoggableElement(), true, tooltip); + + tooltip = _("simexplorer.action.export.tooltip", text); + updateButton(ui.getExportApplication(), true, tooltip); + + tooltip = _("simexplorer.action.synchronize.tooltip", text); + updateButton(ui.getLaunchSynchronize(), true, tooltip); + } /** * Rafraichit les actions i18n dans le menu en fonction de la locale * actuellement utilisée. @@ -283,7 +310,7 @@ ui.getCurrentPage().setEnabled(b); } - protected static void updateButton(JButton button, boolean enabled, String tooltip) { + protected static void updateButton(AbstractButton button, boolean enabled, String tooltip) { button.setEnabled(enabled); button.setToolTipText(tooltip); } 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-11 17:08:25 UTC (rev 816) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-11 17:09:51 UTC (rev 817) @@ -304,8 +304,7 @@ // change the selection, and we don't want the model to be updated // again setEnabled(false); - SimExplorerUIRefreshHelper.refreshDownloadAttachmentAction(ui, model); - SimExplorerUIRefreshHelper.refreshDeleteAttachmentAction(ui, model); + SimExplorerUIRefreshHelper.refreshDownloadAttachmentAction(ui, model); setEnabled(wasEnable); } 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-11 17:08:25 UTC (rev 816) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-11 17:09:51 UTC (rev 817) @@ -43,6 +43,8 @@ protected int dateOrder; + protected int selectedIndex; + private static final long serialVersionUID = -3623331875470531459L; public String getName() { @@ -82,6 +84,10 @@ return isEmpty() ? 0 : list.length; } + public int getSelectedIndex() { + return selectedIndex; + } + public int getDateOrder() { return dateOrder; } @@ -102,6 +108,11 @@ return s.substring(s.lastIndexOf(".") + 1) + "<size: " + size() + ">"; } + public void setSelectedIndex(int selectedIndex) { + this.selectedIndex = selectedIndex; + //TODO should fire a property_changed + } + public void setQuery(String query) { this.query = query; } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java 2008-02-11 17:08:25 UTC (rev 816) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java 2008-02-11 17:09:51 UTC (rev 817) @@ -31,6 +31,9 @@ protected SimExplorerTab tab; + /** flag pour savoir si la source est remote ou non */ + protected boolean remote; + protected MetaData[] listLocal; protected MetaData[] listRemote; @@ -44,6 +47,10 @@ return tab; } + public boolean isRemote() { + return remote; + } + public MetaData[] getListLocal() { return listLocal; } @@ -63,4 +70,8 @@ public void setListRemote(MetaData[] listRemote) { this.listRemote = listRemote; } + + public void setRemote(boolean remote) { + this.remote = remote; + } } \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationSynchronizeTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationSynchronizeTab.jaxx 2008-02-11 17:08:25 UTC (rev 816) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationSynchronizeTab.jaxx 2008-02-11 17:09:51 UTC (rev 817) @@ -1,24 +1,22 @@ <Table> <style source="/../common.css"/> - <row> - <cell fill='horizontal' insets='0,0,0,0'> - <JToolBar> - <JButton id='launchSynchronize'/> - </JToolBar> - </cell> - </row> <row fill="both" weightx="1" weighty="1"> <cell insets='0,0,0,0'> <JScrollPane > - <JSplitPane orientation="horizontal" resizeWeight="0.5" oneTouchExpandable='true'> - <JScrollPane horizontalScrollBarPolicy="horizontal_scrollbar_never"> - <fr.cemagref.simexplorer.is.ui.swing.panel.JApplicationsTreePanel id='contentLocal'/> - </JScrollPane> - <JScrollPane horizontalScrollBarPolicy="horizontal_scrollbar_never"> - <fr.cemagref.simexplorer.is.ui.swing.panel.JApplicationsTreePanel id='contentRemote'/> - </JScrollPane> - </JSplitPane> - </JScrollPane> + <fr.cemagref.simexplorer.is.ui.swing.panel.JApplicationsTreePanel id='contentLocal'/> + </JScrollPane> + </cell> + <cell fill='vertical' insets='0,0,0,0'> + <JToolBar> + <JButton id='exportToRemote'/> + <JButton id='exportToLocale'/> + </JToolBar> + </cell> + <cell insets='0,0,0,0' weightx="1" weighty="1"> + <JScrollPane > + <fr.cemagref.simexplorer.is.ui.swing.panel.JApplicationsTreePanel id='contentRemote'/> + </JScrollPane> + </cell> </row> </Table>

1 0

r816 - in trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing: . tab
by tchemit＠users.labs.libre-entreprise.org 11 Feb '08

11 Feb '08

Author: tchemit Date: 2008-02-11 17:08:25 +0000 (Mon, 11 Feb 2008) New Revision: 816 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx Log: suppression actions inutiles suite ?\195?\160 r?\195?\169union avec Gabriel Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-02-11 17:07:53 UTC (rev 815) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-02-11 17:08:25 UTC (rev 816) @@ -13,7 +13,6 @@ <JSeparator/> <JMenuItem id="showTab_local" mnemonic="{'l'}"/> <JMenuItem id="showTab_remote"/> - <JMenuItem id="showTab_synchronize"/> <JSeparator/> <JMenuItem id="quit"/> </JMenu> @@ -40,8 +39,7 @@ <JToolBar borderPainted='true'> <jaxx.runtime.swing.JAXXToggleButton id='toggleTab_local'/> <jaxx.runtime.swing.JAXXToggleButton id='toggleTab_remote'/> - <jaxx.runtime.swing.JAXXToggleButton id='toggleTab_synchronize'/> - </JToolBar> + </JToolBar> </cell> </row>  Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-11 17:07:53 UTC (rev 815) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-11 17:08:25 UTC (rev 816) @@ -121,8 +121,7 @@ </cell> <cell fill='horizontal' anchor="east"> <JToolBar> - <JButton id='downloadAttachment'/> - <JButton id='deleteAttachment'/> + <JButton id='downloadAttachment'/> </JToolBar> </cell> </row>

1 0