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

r975 - in trunk/simexplorer-is: simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/entities/metadata simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by glandais＠users.labs.libre-entreprise.org 14 Feb '08

14 Feb '08

Author: glandais Date: 2008-02-14 16:02:10 +0000 (Thu, 14 Feb 2008) New Revision: 975 Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/MetaDataFactory.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseThread.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java Log: Removed parent data Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-02-14 15:49:46 UTC (rev 974) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-02-14 16:02:10 UTC (rev 975) @@ -61,12 +61,6 @@ /** The attachments. */ private List<Attachment> attachments; - /** The parent data uuid. */ - private String parentDataUuid; - // TODO Why String representation, instead of Version ? - /** The parent data version. */ - private String parentDataVersion; - /** The parent version uuid. */ private String parentVersionUuid; @@ -279,44 +273,6 @@ } /** - * Gets the parent data uuid. - * - * @return the parentDataUuid - */ - public String getParentDataUuid() { - return parentDataUuid; - } - - /** - * Sets the parent data uuid. - * - * @param parentDataUuid - * the parentDataUuid to set - */ - public void setParentDataUuid(String parentDataUuid) { - this.parentDataUuid = parentDataUuid; - } - - /** - * Gets the parent data version. - * - * @return the parentDataVersion - */ - public String getParentDataVersion() { - return parentDataVersion; - } - - /** - * Sets the parent data version. - * - * @param parentDataVersion - * the parentDataVersion to set - */ - public void setParentDataVersion(String parentDataVersion) { - this.parentDataVersion = parentDataVersion; - } - - /** * Gets the parent version uuid. * * @return the parentVersionUuid Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/MetaDataFactory.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/MetaDataFactory.java 2008-02-14 15:49:46 UTC (rev 974) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/MetaDataFactory.java 2008-02-14 16:02:10 UTC (rev 975) @@ -111,10 +111,6 @@ } entity.setHash(getXMLProperty(xmlElement, KEY_METADATA_HASH)); - entity.setParentDataUuid(getXMLProperty(xmlElement, - KEY_METADATA_PARENTDATA_UUID)); - entity.setParentDataVersion(getXMLProperty(xmlElement, - KEY_METADATA_PARENTDATA_VERSION)); entity.setParentVersionUuid(getXMLProperty(xmlElement, KEY_METADATA_PARENTVERSION_UUID)); entity.setParentVersionVersion(getXMLProperty(xmlElement, @@ -203,10 +199,6 @@ setXMLProperty(document, xmlElement, KEY_METADATA_HASH, element .getHash()); - setXMLProperty(document, xmlElement, KEY_METADATA_PARENTDATA_UUID, - element.getParentDataUuid()); - setXMLProperty(document, xmlElement, KEY_METADATA_PARENTDATA_VERSION, - element.getParentDataVersion()); setXMLProperty(document, xmlElement, KEY_METADATA_PARENTVERSION_UUID, element.getParentVersionUuid()); setXMLProperty(document, xmlElement, Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-02-14 15:49:46 UTC (rev 974) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-02-14 16:02:10 UTC (rev 975) @@ -47,41 +47,13 @@ /** * Generate meta data entity. * - * @param uuid - * the uuid - * @param version - * the version - * @param parentVersion - * the parent version - * @param parentData - * the parent data + * @param uuid the uuid + * @param version the version + * @param parentVersion the parent version * * @return the meta data */ - public MetaData generateMetaDataEntity(String uuid, Version version, - MetaData parentVersion, MetaData parentData) { - MetaData me = generateMetaDataEntity(uuid, version, parentVersion); - if (parentData != null) { - me.setParentDataUuid(parentData.getUuid()); - me.setParentDataVersion(parentData.getVersion().toString()); - } - return me; - } - - /** - * Generate meta data entity. - * - * @param uuid - * the uuid - * @param version - * the version - * @param parentVersion - * the parent version - * - * @return the meta data - */ - public MetaData generateMetaDataEntity(String uuid, Version version, - MetaData parentVersion) { + public MetaData generateMetaDataEntity(String uuid, Version version, MetaData parentVersion) { MetaData me = generateMetaDataEntity(uuid, version); if (parentVersion != null) { @@ -97,10 +69,8 @@ /** * Generate meta data entity. * - * @param uuid - * the uuid - * @param version - * the version + * @param uuid the uuid + * @param version the version * * @return the meta data */ @@ -124,8 +94,6 @@ } me.setDescriptors(descriptors); me.setAttachments(new ArrayList<Attachment>()); - me.setParentDataUuid(null); - me.setParentDataVersion(null); me.setParentVersionUuid(null); me.setParentVersionVersion(null); @@ -138,8 +106,7 @@ * @return the meta data */ public MetaData generateMetaDataEntity() { - return generateMetaDataEntity(UUID.randomUUID().toString(), Version - .valueOf("1.0")); + return generateMetaDataEntity(UUID.randomUUID().toString(), Version.valueOf("1.0")); } /** @@ -165,15 +132,13 @@ /** * Generate versionned meta data entity. * - * @param nbMax - * the nb max + * @param nbMax the nb max * * @return the meta data[] */ public MetaData[] generateVersionnedMetaDataEntity(int nbMax) { - Version[] versions = VersionGenerator.getInstance().generateVersions( - nbMax); + Version[] versions = VersionGenerator.getInstance().generateVersions(nbMax); String uuid = UUID.randomUUID().toString(); int nb = versions.length; @@ -189,15 +154,13 @@ /** * Generate versionned meta data. * - * @param mandatory - * the mandatory + * @param mandatory the mandatory * * @return the meta data[] */ public MetaData[] generateVersionnedMetaData(Version mandatory) { - Version[] versions = VersionGenerator.getInstance().generateVersions( - mandatory); + Version[] versions = VersionGenerator.getInstance().generateVersions(mandatory); String uuid = UUID.randomUUID().toString(); int nb = versions.length; Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java 2008-02-14 15:49:46 UTC (rev 974) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java 2008-02-14 16:02:10 UTC (rev 975) @@ -774,9 +774,6 @@ } element.setAttachments(finalAttachments); - element.setParentDataUuid(document.get(KEY_PARENTDATA_UUID)); - element.setParentDataVersion(document.get(KEY_PARENTDATA_VERSION)); - element.setParentVersionUuid(document.get(KEY_PARENTVERSION_UUID)); element .setParentVersionVersion(document @@ -863,10 +860,6 @@ i++; } - addSimpleField(document, KEY_PARENTDATA_UUID, element - .getParentDataUuid()); - addSimpleField(document, KEY_PARENTDATA_VERSION, element - .getParentDataVersion()); addSimpleField(document, KEY_PARENTVERSION_UUID, element .getParentVersionUuid()); addSimpleField(document, KEY_PARENTVERSION_VERSION, element Modified: trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseThread.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseThread.java 2008-02-14 15:49:46 UTC (rev 974) +++ trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseThread.java 2008-02-14 16:02:10 UTC (rev 975) @@ -120,7 +120,6 @@ for (int j = 0; j < ncycles; j++) { MetaData[] mes = mdg.generateVersionnedMetaDataEntity(); for (MetaData me : mes) { - me.setParentDataUuid(Integer.toString(idThreadLucene)); database.insertElement(me, new ArrayList<Reader>()); id = me.getUuid(); } Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-02-14 15:49:46 UTC (rev 974) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-02-14 16:02:10 UTC (rev 975) @@ -314,12 +314,6 @@ nodes.add(simpleNode(getMessages().get( "simexplorer.ui.web.metadata.hash"), m.getHash())); nodes.add(simpleNode(getMessages().get( - "simexplorer.ui.web.metadata.parentdata.uuid"), m - .getParentDataUuid())); - nodes.add(simpleNode(getMessages().get( - "simexplorer.ui.web.metadata.parentdata.version"), m - .getParentDataVersion())); - nodes.add(simpleNode(getMessages().get( "simexplorer.ui.web.metadata.parentversion.uuid"), m .getParentVersionUuid())); nodes.add(simpleNode(getMessages().get(

1 0

r974 - trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 14 Feb '08

14 Feb '08

Author: tchemit Date: 2008-02-14 15:49:46 +0000 (Thu, 14 Feb 2008) New Revision: 974 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: suppression traduction navigation, on utilise maintenant la m?\195?\170me traduction que dans l'onglet synchronisation Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-14 15:46:29 UTC (rev 973) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-14 15:49:46 UTC (rev 974) @@ -170,7 +170,6 @@ simexplorer.node.descriptors=Descriptor(s) ({0}) simexplorer.node.explorations=Exlorations simexplorer.node.libraries=Librairies -simexplorer.node.navigation=Navigation tree simexplorer.node.navigation.local=Local element simexplorer.node.navigation.remote=Remote element simexplorer.node.noattachments=No attachment Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-14 15:46:29 UTC (rev 973) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-14 15:49:46 UTC (rev 974) @@ -170,7 +170,6 @@ simexplorer.node.descriptors=Descripteur(s) ({0}) simexplorer.node.explorations=Exlorations simexplorer.node.libraries=Librairies -simexplorer.node.navigation=Navigation simexplorer.node.navigation.local=\u00E9l\u00E9ment local simexplorer.node.navigation.remote=\u00E9l\u00E9ment distant simexplorer.node.noattachments=Pas de fichier attach\u00E9

1 0

r973 - trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment
by glandais＠users.labs.libre-entreprise.org 14 Feb '08

14 Feb '08

Author: glandais Date: 2008-02-14 15:46:29 +0000 (Thu, 14 Feb 2008) New Revision: 973 Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java Log: Few optimizations Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java 2008-02-14 15:44:29 UTC (rev 972) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java 2008-02-14 15:46:29 UTC (rev 973) @@ -45,10 +45,8 @@ protected String baseFolder; /** - * Constructeur utilisant la configuration par defaut. - * <p/> - * TODO on devrait supprimer ce constructeur, car on doit maitriser la - * configuration. + * Constructeur utilisant la configuration par defaut. <p/> TODO on devrait supprimer ce constructeur, car on doit + * maitriser la configuration. */ public FileSystemAttachmentHandler() { baseFolder = Config.getProperties().getProperty("simexplorer.data"); @@ -56,7 +54,7 @@ /** * Constructeur utilisant une configuration spécifique - * + * * @param baseFolder le répertoire de base */ public FileSystemAttachmentHandler(String baseFolder) { @@ -64,36 +62,36 @@ } /** - * Retrieve file associated to content Create directories associated to - * file. + * Retrieve file associated to content Create directories associated to file. * - * @param entity - * DataEntity related to content - * @param attachment - * the attachment + * @param entity DataEntity related to content + * @param attachment the attachment * * @return Instance of file */ - private File getFile(MetaData entity, Attachment attachment) { - String resultPath = baseFolder; + private File getFile(MetaData entity, Attachment attachment, boolean createDir) { + StringBuffer resultPath = new StringBuffer(baseFolder); + String uuid = entity.getUuid(); + // Create file path String separator = File.separator; - if (entity.getUuid().length() > 3) { - resultPath = resultPath + entity.getUuid().substring(0, 1) + separator - + entity.getUuid().substring(1, 2) + separator - + entity.getUuid().substring(2, 3) + separator + entity.getUuid(); + if (uuid.length() > 3) { + resultPath.append(uuid.substring(0, 1)).append(separator).append(uuid.substring(1, 2)).append(separator) + .append(uuid.substring(2, 3)).append(separator).append(uuid); } else { - resultPath = resultPath + entity.getUuid(); + resultPath.append(uuid); } - resultPath = resultPath + separator + entity.getVersion().toString() + separator - + attachment.getUniqueId(); + resultPath.append(separator).append(entity.getVersion().toString()).append(separator).append( + attachment.getUniqueId()); - File result = new File(resultPath); - // Create directories - File resultFolder = new File(result.getParent()); - if (!resultFolder.exists()) { - resultFolder.mkdirs(); + File result = new File(resultPath.toString()); + if (createDir) { + // Create directories + File resultFolder = new File(result.getParent()); + if (!resultFolder.exists()) { + resultFolder.mkdirs(); + } } return result; @@ -103,12 +101,11 @@ * @see fr.cemagref.simexplorer.is.storage.attachment.AttachmentHandler#retrieveData(fr.cemagref.simexplorer.is.entities.metadata.MetaData, java.lang.String) */ @Override - public InputStream retrieveData(MetaData entity, Attachment attachment) - throws SimExplorerStorageException { + public InputStream retrieveData(MetaData entity, Attachment attachment) throws SimExplorerStorageException { // Simple stream on file FileInputStream fis; try { - fis = new FileInputStream(getFile(entity, attachment)); + fis = new FileInputStream(getFile(entity, attachment, false)); } catch (FileNotFoundException e) { throw new SimExplorerStorageException(e); } @@ -119,11 +116,10 @@ * @see fr.cemagref.simexplorer.is.storage.attachment.AttachmentHandler#retrieveMD5Data(fr.cemagref.simexplorer.is.entities.metadata.MetaData, java.lang.String) */ @Override - public String retrieveMD5Data(MetaData entity, Attachment attachment) - throws SimExplorerStorageException { + public String retrieveMD5Data(MetaData entity, Attachment attachment) throws SimExplorerStorageException { String md5; try { - md5 = MD5.asHex(MD5.getHash(getFile(entity, attachment))); + md5 = MD5.asHex(MD5.getHash(getFile(entity, attachment, false))); } catch (Exception e) { throw new SimExplorerStorageException(e); } @@ -134,14 +130,13 @@ * @see fr.cemagref.simexplorer.is.storage.attachment.AttachmentHandler#storeData(fr.cemagref.simexplorer.is.entities.metadata.MetaData, java.lang.String, java.io.InputStream) */ @Override - public void storeData(MetaData entity, Attachment attachment, InputStream is) - throws SimExplorerStorageException { + public void storeData(MetaData entity, Attachment attachment, InputStream is) throws SimExplorerStorageException { BufferedOutputStream bout = null; // Simple stream on file try { - File file = getFile(entity, attachment); + File file = getFile(entity, attachment, true); FileOutputStream fos = new FileOutputStream(file); // Buffer copy stream to stream @@ -154,7 +149,7 @@ break; bout.write(datum); } - + bout.flush(); } catch (FileNotFoundException e) { @@ -181,11 +176,10 @@ * @see fr.cemagref.simexplorer.is.storage.attachment.AttachmentHandler#deleteData(fr.cemagref.simexplorer.is.entities.metadata.MetaData, java.lang.String) */ @Override - public void deleteData(MetaData entity, Attachment attachment) - throws SimExplorerStorageException { + public void deleteData(MetaData entity, Attachment attachment) throws SimExplorerStorageException { try { // Simple delete on file - getFile(entity, attachment).delete(); + getFile(entity, attachment, false).delete(); } catch (Exception e) { throw new SimExplorerStorageException(e); }

1 0

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

14 Feb '08

Author: tchemit Date: 2008-02-14 15:44:29 +0000 (Thu, 14 Feb 2008) New Revision: 972 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java 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 trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryNextAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryPreviousAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.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/actions/ShowSynchronizeTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/UnconnectAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java Log: propagation des modifications sur les actions (refresh, node,EntitiesAction,...) Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java 2008-02-14 15:41:19 UTC (rev 971) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java 2008-02-14 15:44:29 UTC (rev 972) @@ -19,8 +19,8 @@ package fr.cemagref.simexplorer.is.ui.swing.actions; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; import fr.cemagref.simexplorer.is.ui.swing.JListTab; +import fr.cemagref.simexplorer.is.ui.swing.ListTabRefreshHelper; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; @@ -92,7 +92,7 @@ modelTab.setData(model.getList()); // refresh ui - SimExplorerUIRefreshHelper.refreshListTabUI(container, model); + ListTabRefreshHelper.refreshListTabUI(container, model); } @Override Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java 2008-02-14 15:41:19 UTC (rev 971) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java 2008-02-14 15:44:29 UTC (rev 972) @@ -23,7 +23,7 @@ import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel; import fr.cemagref.simexplorer.is.ui.swing.JListTab; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; +import fr.cemagref.simexplorer.is.ui.swing.ListTabRefreshHelper; import javax.swing.Action; import javax.swing.JComboBox; @@ -89,7 +89,7 @@ modelTab.setData(model.getList()); // refresh ui - SimExplorerUIRefreshHelper.refreshListTabUI(container, model); + ListTabRefreshHelper.refreshListTabUI(container, model); } @Override Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-02-14 15:41:19 UTC (rev 971) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-02-14 15:44:29 UTC (rev 972) @@ -24,7 +24,7 @@ import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; import fr.cemagref.simexplorer.is.ui.swing.LoginUI; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; +import fr.cemagref.simexplorer.is.ui.swing.MainUIRefreshHelper; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; import static org.codelutin.i18n.I18n._; @@ -82,7 +82,7 @@ @Override protected void afterAction(ActionEvent e) throws Exception { - SimExplorerUIRefreshHelper.refreshConnnectState(getMainUI(), getContext().isConnected()); + MainUIRefreshHelper.refreshConnnectState(getMainUI(), getContext().isConnected(), null); } @Override Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java 2008-02-14 15:41:19 UTC (rev 971) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java 2008-02-14 15:44:29 UTC (rev 972) @@ -28,7 +28,6 @@ import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; -import javax.swing.tree.TreeNode; import java.awt.event.ActionEvent; /** @@ -76,7 +75,7 @@ protected void doAction(ActionEvent e) throws Exception { model.setRootNode(element); // create navigation tree - TreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getRootNode()); + LoggableElementTreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getRootNode(), model.isRemote()); model.getHistory().add(root); // push it in tree DetailTabRefreshHelper.updateDetailNavigationTree((JDetailTab) getUI(), model.getHistory()); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java 2008-02-14 15:41:19 UTC (rev 971) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java 2008-02-14 15:44:29 UTC (rev 972) @@ -20,6 +20,7 @@ import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.Version; +import fr.cemagref.simexplorer.is.entities.EntitiesAction; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; @@ -68,7 +69,7 @@ tree = ui.getNavigationTree(); node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree); boolean result; - result = LoggableElementTreeHelper.canExport(node); + result = EntitiesAction.EXPORT.accept(node); if (result) { element = (LoggableElement) node.getUserObject(); uuid = element.getMetaData().getUuid(); 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-14 15:41:19 UTC (rev 971) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToLocalAction.java 2008-02-14 15:44:29 UTC (rev 972) @@ -18,13 +18,14 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.actions; +import fr.cemagref.simexplorer.is.entities.EntitiesAction; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.Version; +import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; +import fr.cemagref.simexplorer.is.ui.swing.JDetailTab; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; -import fr.cemagref.simexplorer.is.ui.swing.JDetailTab; -import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; import javax.swing.JTree; import java.awt.event.ActionEvent; @@ -68,7 +69,7 @@ tree = ui.getNavigationTree(); node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree); boolean result; - result = LoggableElementTreeHelper.canExport(node); + result = EntitiesAction.EXPORT.accept(node); if (result) { element = (LoggableElement) node.getUserObject(); uuid = element.getMetaData().getUuid(); @@ -79,7 +80,7 @@ @Override protected void doAction(ActionEvent e) throws Exception { - throw new SimExplorerRuntimeException(this+" is not implemented yet!"); + throw new SimExplorerRuntimeException(this + " is not implemented yet!"); } @Override 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-14 15:41:19 UTC (rev 971) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToRemoteAction.java 2008-02-14 15:44:29 UTC (rev 972) @@ -20,6 +20,7 @@ import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.Version; +import fr.cemagref.simexplorer.is.entities.EntitiesAction; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; @@ -68,7 +69,7 @@ tree = ui.getNavigationTree(); node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree); boolean result; - result = LoggableElementTreeHelper.canExport(node); + result = EntitiesAction.EXPORT.accept(node); if (result) { element = (LoggableElement) node.getUserObject(); uuid = element.getMetaData().getUuid(); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryNextAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryNextAction.java 2008-02-14 15:41:19 UTC (rev 971) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryNextAction.java 2008-02-14 15:44:29 UTC (rev 972) @@ -23,9 +23,8 @@ import fr.cemagref.simexplorer.is.ui.swing.JDetailTab; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; +import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; -import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.TreeNode; import java.awt.event.ActionEvent; /** @author chemit */ @@ -59,8 +58,9 @@ @Override protected void doAction(ActionEvent e) throws Exception { - TreeNode node = model.getHistory().gotoNext(); - model.setRootNode((LoggableElement) ((DefaultMutableTreeNode) node).getUserObject()); + LoggableElementTreeNode node = model.getHistory().gotoNext(); + model.setRemote(node.isRemote()); + model.setRootNode((LoggableElement) node.getUserObject()); DetailTabRefreshHelper.updateDetailNavigationTree((JDetailTab) getUI(), model.getHistory()); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryPreviousAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryPreviousAction.java 2008-02-14 15:41:19 UTC (rev 971) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryPreviousAction.java 2008-02-14 15:44:29 UTC (rev 972) @@ -23,9 +23,8 @@ import fr.cemagref.simexplorer.is.ui.swing.JDetailTab; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; +import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; -import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.TreeNode; import java.awt.event.ActionEvent; /** @author chemit */ @@ -54,13 +53,14 @@ return false; } model = (DetailTabModel) getModel(); - return model.getHistory().hastPrevious(); + return model.getHistory().hasPrevious(); } @Override protected void doAction(ActionEvent e) throws Exception { - TreeNode node = model.getHistory().gotoPrevious(); - model.setRootNode((LoggableElement) ((DefaultMutableTreeNode) node).getUserObject()); + LoggableElementTreeNode node = model.getHistory().gotoPrevious(); + model.setRemote(node.isRemote()); + model.setRootNode((LoggableElement) node.getUserObject()); DetailTabRefreshHelper.updateDetailNavigationTree((JDetailTab) getUI(), model.getHistory()); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java 2008-02-14 15:41:19 UTC (rev 971) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java 2008-02-14 15:44:29 UTC (rev 972) @@ -22,7 +22,7 @@ import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.JListTab; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; +import fr.cemagref.simexplorer.is.ui.swing.ListTabRefreshHelper; import javax.swing.JTable; import java.awt.event.ActionEvent; @@ -59,7 +59,7 @@ if (!model.hasQuery()) { // directly refresh search actions // but do not realize action - SimExplorerUIRefreshHelper.refreshSearchActions(ui,model); + ListTabRefreshHelper.refreshSearchActions(ui,model); return false; } // only reset search if something was previously search @@ -87,7 +87,7 @@ modelTab.setData(model.getList()); // refresh ui - SimExplorerUIRefreshHelper.refreshListTabUI(container, model); + ListTabRefreshHelper.refreshListTabUI(container, model); } @Override Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java 2008-02-14 15:41:19 UTC (rev 971) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java 2008-02-14 15:44:29 UTC (rev 972) @@ -22,7 +22,7 @@ import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.JListTab; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; +import fr.cemagref.simexplorer.is.ui.swing.ListTabRefreshHelper; import javax.swing.JTextField; import javax.swing.JTable; @@ -79,7 +79,7 @@ modelTab.setData(model.getList()); // refresh ui - SimExplorerUIRefreshHelper.refreshListTabUI(container, model); + ListTabRefreshHelper.refreshListTabUI(container, model); } @Override 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-14 15:41:19 UTC (rev 971) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-14 15:44:29 UTC (rev 972) @@ -34,7 +34,6 @@ import javax.swing.event.ListSelectionListener; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; -import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -88,7 +87,7 @@ protected void initUI(JDetailTab ui, DetailTabModel model) { DetailTabRefreshHelper.refreshTreeDetailActions(ui, null); // create navigation tree - TreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getRootNode()); + LoggableElementTreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getRootNode(), model.isRemote()); model.getHistory().add(root); DetailTabRefreshHelper.updateDetailNavigationTree(ui, model.getHistory()); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java 2008-02-14 15:41:19 UTC (rev 971) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java 2008-02-14 15:44:29 UTC (rev 972) @@ -23,7 +23,7 @@ import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; import fr.cemagref.simexplorer.is.ui.swing.JSynchronizeTab; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; +import fr.cemagref.simexplorer.is.ui.swing.SynchronizeTabRefreshHelper; import fr.cemagref.simexplorer.is.ui.swing.actions.util.ShowTabAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; @@ -136,12 +136,12 @@ } protected void initUI(JSynchronizeTab ui, SynchronizeTabModel model) { - SimExplorerUIRefreshHelper.refreshTreeLocalActions(ui, null); - SimExplorerUIRefreshHelper.refreshTreeRemoteActions(ui, null); - SimExplorerUIRefreshHelper.refreshExportElementToLocalAction(ui, model); - SimExplorerUIRefreshHelper.refreshExportElementToRemoteAction(ui, model); + SynchronizeTabRefreshHelper.refreshTreeLocalActions(ui, null); + SynchronizeTabRefreshHelper.refreshTreeRemoteActions(ui, null); + SynchronizeTabRefreshHelper.refreshExportElementToLocalAction(ui, model); + SynchronizeTabRefreshHelper.refreshExportElementToRemoteAction(ui, model); - SimExplorerUIRefreshHelper.updateSynchronizeNavigationTrees(ui, model); + SynchronizeTabRefreshHelper.updateSynchronizeNavigationTrees(ui, model); } @Override @@ -173,7 +173,7 @@ } // on rafraichit toujours ici les actions de l'arbre qui sont // indépendantes du model et dépendent juste dunoeud sélectionné - SimExplorerUIRefreshHelper.refreshTreeLocalActions(getTabUI(), node); + SynchronizeTabRefreshHelper.refreshTreeLocalActions(getTabUI(), node); Object o = node == null ? null : node.getUserObject(); @@ -193,7 +193,7 @@ */ public void propertyChange(PropertyChangeEvent evt) { log.debug(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); - SimExplorerUIRefreshHelper.refreshExportElementToRemoteAction(getTabUI(), getTabModel()); + SynchronizeTabRefreshHelper.refreshExportElementToRemoteAction(getTabUI(), getTabModel()); } } @@ -218,7 +218,7 @@ } // on rafraichit toujours ici les actions de l'arbre qui sont // indépendantes du model et dépendent juste dunoeud sélectionné - SimExplorerUIRefreshHelper.refreshTreeRemoteActions(getTabUI(), node); + SynchronizeTabRefreshHelper.refreshTreeRemoteActions(getTabUI(), node); Object o = node == null ? null : node.getUserObject(); @@ -238,7 +238,7 @@ */ public void propertyChange(PropertyChangeEvent evt) { log.debug(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); - SimExplorerUIRefreshHelper.refreshExportElementToLocalAction(getTabUI(), getTabModel()); + SynchronizeTabRefreshHelper.refreshExportElementToLocalAction(getTabUI(), getTabModel()); } } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/UnconnectAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/UnconnectAction.java 2008-02-14 15:41:19 UTC (rev 971) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/UnconnectAction.java 2008-02-14 15:44:29 UTC (rev 972) @@ -18,10 +18,16 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.actions; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; +import fr.cemagref.simexplorer.is.ui.swing.MainUIRefreshHelper; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; +import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; +import fr.cemagref.simexplorer.is.ui.swing.model.HistoryModel; +import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; import java.awt.event.ActionEvent; +import java.util.Iterator; +import java.util.List; /** * Action pour se deconnecter du serveur distant @@ -40,6 +46,8 @@ ) public class UnconnectAction extends SimExplorerAbstractAction { + HistoryModel<LoggableElementTreeNode> history; + private static final long serialVersionUID = 2248642521834932196L; public UnconnectAction(String name) { @@ -56,10 +64,48 @@ super.doAction(e); getContext().setToken(null); //TODO disconnect from server ? + // must clean the history of detail tab + DetailTabModel model = (DetailTabModel) SimExplorerTab.detail.getModel(); + + history = model.getHistory(); + if (history.isEmpty()) { + // nothing to do + return; + } + LoggableElementTreeNode current = history.getCurrent(); + + List<LoggableElementTreeNode> datas = history.getData(); + for (Iterator<LoggableElementTreeNode> it = datas.iterator(); it.hasNext();) + { + if (it.next().isRemote()) { + it.remove(); + } + } + if (datas.isEmpty()) { + // pas de position + history.setCurrentIndex(null); + } else { + Integer pos; + if (!current.isRemote()) { + // on doit repositionner sur l'élément local courant + pos = datas.indexOf(current); + } else { + // on se met sur le dernier element + pos = datas.size() - 1; + } + // on repositionne sur le dernier element de l'historique + history.setCurrentIndex(pos); + } } @Override protected void afterAction(ActionEvent e) throws Exception { - SimExplorerUIRefreshHelper.refreshConnnectState(getMainUI(), false); + MainUIRefreshHelper.refreshConnnectState(getMainUI(), false, history); } + + @Override + protected void clear() { + super.clear(); + history = null; + } } \ No newline at end of file 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-14 15:41:19 UTC (rev 971) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-14 15:44:29 UTC (rev 972) @@ -25,8 +25,8 @@ import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; import fr.cemagref.simexplorer.is.ui.swing.JListTab; +import fr.cemagref.simexplorer.is.ui.swing.ListTabRefreshHelper; import fr.cemagref.simexplorer.is.ui.swing.actions.ShowSynchronizeTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; @@ -89,7 +89,7 @@ public void valueChanged(ListSelectionEvent e) { int index = ui.getTable().getSelectedRow(); model.setSelectedIndex(index); - SimExplorerUIRefreshHelper.refreshListTablePopupMenu(ui,model); + ListTabRefreshHelper.refreshListTablePopupMenu(ui,model); } }); // add a show detail action when double click on a row of the table @@ -158,7 +158,7 @@ ui.getSearchText().addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { - SimExplorerUIRefreshHelper.refreshSearchActions(ui, model); + ListTabRefreshHelper.refreshSearchActions(ui, model); } }); //TODO Est-ce vraiment le bon endroit pour faire ça ? @@ -168,6 +168,6 @@ } protected void initUI(JListTab ui, ListTabModel model) { - SimExplorerUIRefreshHelper.refreshListTabUI(ui, model); + ListTabRefreshHelper.refreshListTabUI(ui, model); } }

1 0

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

14 Feb '08

Author: tchemit Date: 2008-02-14 15:41:19 +0000 (Thu, 14 Feb 2008) New Revision: 971 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java Log: la fermeture de l'onglet de detail n'efface plus l'historique, puisqu'on peut desormais mixer du local ou remote dans l'historique Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java 2008-02-14 15:39:40 UTC (rev 970) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java 2008-02-14 15:41:19 UTC (rev 971) @@ -18,14 +18,12 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.actions; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; -import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import java.awt.event.ActionEvent; /** - * Action pour fermer un tab + * Action pour fermer un onglet * * @author chemit */ @@ -48,8 +46,5 @@ @Override protected void doAction(ActionEvent e) throws Exception { getTab().closeTab(getMainUI().getContent()); - if (getTab() == SimExplorerTab.detail) { - ((DetailTabModel) getModel()).clear(); - } } }

1 0

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

14 Feb '08

Author: tchemit Date: 2008-02-14 15:39:40 +0000 (Thu, 14 Feb 2008) New Revision: 970 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java Log: ajout de la propri?\195?\169t?\195?\169 remote lors de la construction de l'arbre + utilisation de LoggableElementTreeNode au lieu de TreeNode + suppression methodes de tests d'actions (voir EntitiesAction) Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java 2008-02-14 15:38:28 UTC (rev 969) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java 2008-02-14 15:39:40 UTC (rev 970) @@ -32,7 +32,6 @@ import static org.codelutin.i18n.I18n._; import javax.swing.JTree; -import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; /** @@ -91,7 +90,7 @@ return null; } node = (LoggableElementTreeNode) o; - } + } return node; } @@ -106,167 +105,137 @@ return node; } - public static boolean isLoggableElement(LoggableElementTreeNode node) { - return node != null && node.isLoggableElement(); - } - - public static boolean canExport(LoggableElementTreeNode node) { - return isLoggableElement(node) && node.getUserObject() instanceof ExplorationApplication; - } - - public static boolean canDelete(LoggableElementTreeNode node) { - return node != null && node.isLoggableElement(); - } - - public static boolean canDownload(LoggableElementTreeNode node) { - return node != null && node.isDownloadableElement(); - } - - public static TypeNode getTypeNode(LoggableElementTreeNode node) { - Object userObject = node.getUserObject(); - if (userObject instanceof String) { - // do not treate string - return null; - } - for (TypeNode typeNode : TypeNode.values()) { - if (typeNode.getKlass() == node.getClass()) { - return typeNode; - } - } - return null; - } - - public static TreeNode buildLoggableElementNode(LoggableElement element) { + public static LoggableElementTreeNode buildLoggableElementNode(LoggableElement element, boolean remote) { if (element instanceof ExplorationApplication) { - return buildExplorationApplicationNode(null, (ExplorationApplication) element); + return buildExplorationApplicationNode(null, (ExplorationApplication) element, remote); } if (element instanceof Component) { - return buildComponentNode(null, (Component) element); + return buildComponentNode(null, (Component) element, remote); } if (element instanceof ExplorationData) { - return buildExplorationDataNode(null, (ExplorationData) element); + return buildExplorationDataNode(null, (ExplorationData) element, remote); } if (element instanceof Library) { - return buildLibraryNode(null, (Library) element); + return buildLibraryNode(null, (Library) element, remote); } throw new SimExplorerRuntimeException("could not foud a builder for " + element); } - public static TreeNode buildExplorationApplicationNode(LoggableElementTreeNode parent, ExplorationApplication element) { - LoggableElementTreeNode result = new LoggableElementTreeNode(parent, element, true); + public static LoggableElementTreeNode buildExplorationApplicationNode(LoggableElementTreeNode parent, ExplorationApplication element, boolean remote) { + LoggableElementTreeNode result = new LoggableElementTreeNode(parent, element, remote, true); LoggableElementTreeNode tmpNode; // build components node and his childs - tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.components"), true); + tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.components"), remote, true); if (element.getComponents() != null) { for (Component component : element.getComponents()) { - buildComponentNode(tmpNode, component); + buildComponentNode(tmpNode, component, remote); } } // build explorations node and his childs - tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.explorations"), true); + tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.explorations"), remote, true); if (element.getExplorations() != null) { for (ExplorationData explorationData : element.getExplorations()) { - buildExplorationDataNode(tmpNode, explorationData); + buildExplorationDataNode(tmpNode, explorationData, remote); } } return result; } - public static TreeNode buildComponentNode(LoggableElementTreeNode parent, Component element) { + public static LoggableElementTreeNode buildComponentNode(LoggableElementTreeNode parent, Component element, boolean remote) { - LoggableElementTreeNode result = new LoggableElementTreeNode(parent, element, true); + LoggableElementTreeNode result = new LoggableElementTreeNode(parent, element, remote, true); LoggableElementTreeNode tmpNode; // build constantes nodes - tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.constants"), true); + tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.constants"), remote, true); if (element.getConstants() != null) { for (Constant constante : element.getConstants()) { - buildConstantNode(tmpNode, constante); + buildConstantNode(tmpNode, constante, remote); } } // build structures nodes - tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.structures"), true); + tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.structures"), remote, true); if (element.getStructures() != null) { for (Structure structure : element.getStructures()) { - buildStructureNode(tmpNode, structure); + buildStructureNode(tmpNode, structure, remote); } } // build Codes nodes - tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.codes"), true); + tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.codes"), remote, true); if (element.getCodes() != null) { for (Code code : element.getCodes()) { - buildCodeNode(tmpNode, code); + buildCodeNode(tmpNode, code, remote); } } // build libraries nodes - tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.libraries"), true); + tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.libraries"), remote, true); if (element.getLibraries() != null) { for (Library library : element.getLibraries()) { - buildLibraryNode(tmpNode, library); + buildLibraryNode(tmpNode, library, remote); } } return result; } - public static LoggableElementTreeNode buildExplorationDataNode(LoggableElementTreeNode parent, ExplorationData element) { - LoggableElementTreeNode result = new LoggableElementTreeNode(parent, element, true); + public static LoggableElementTreeNode buildExplorationDataNode(LoggableElementTreeNode parent, ExplorationData element, boolean remote) { + LoggableElementTreeNode result = new LoggableElementTreeNode(parent, element, remote, true); LoggableElementTreeNode tmpNode; // build constant values nodes - tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.constantvalues"), true); + tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.constantvalues"), remote, true); if (element.getValuesMap() != null) { for (ConstantValue library : element.getValuesMap()) { - buildConstantValueNode(tmpNode, library); + buildConstantValueNode(tmpNode, library, remote); } } // build result node if (element.getResult() != null) { - buildResultNode(result, element.getResult()); + buildResultNode(result, element.getResult(), remote); } return result; } - public static TreeNode buildLibraryNode(LoggableElementTreeNode parent, Library element) { + public static LoggableElementTreeNode buildLibraryNode(LoggableElementTreeNode parent, Library element, boolean remote) { LoggableElementTreeNode result; - result = new LoggableElementTreeNode(parent, element, false); + result = new LoggableElementTreeNode(parent, element, remote, false); return result; } - public static TreeNode buildCodeNode(LoggableElementTreeNode parent, Code element) { + public static LoggableElementTreeNode buildCodeNode(LoggableElementTreeNode parent, Code element, boolean remote) { LoggableElementTreeNode result; - result = new LoggableElementTreeNode(parent, element, false); + result = new LoggableElementTreeNode(parent, element, remote, false); return result; } - public static TreeNode buildStructureNode(LoggableElementTreeNode parent, Structure element) { + public static LoggableElementTreeNode buildStructureNode(LoggableElementTreeNode parent, Structure element, boolean remote) { LoggableElementTreeNode result; - result = new LoggableElementTreeNode(parent, element, false); + result = new LoggableElementTreeNode(parent, element, remote, false); return result; } - public static TreeNode buildConstantNode(LoggableElementTreeNode parent, Constant element) { + public static LoggableElementTreeNode buildConstantNode(LoggableElementTreeNode parent, Constant element, boolean remote) { LoggableElementTreeNode result; - result = new LoggableElementTreeNode(parent, element, false); + result = new LoggableElementTreeNode(parent, element, remote, false); return result; } - public static TreeNode buildConstantValueNode(LoggableElementTreeNode parent, ConstantValue element) { + public static LoggableElementTreeNode buildConstantValueNode(LoggableElementTreeNode parent, ConstantValue element, boolean remote) { LoggableElementTreeNode result; - result = new LoggableElementTreeNode(parent, element.getConstant().getName(), true); - result.add(new LoggableElementTreeNode(result, element.getValue(), false)); + result = new LoggableElementTreeNode(parent, element.getConstant().getName(), remote, true); + result.add(new LoggableElementTreeNode(result, element.getValue(), remote, false)); return result; } - public static TreeNode buildResultNode(LoggableElementTreeNode parent, Result element) { + public static LoggableElementTreeNode buildResultNode(LoggableElementTreeNode parent, Result element, boolean remote) { LoggableElementTreeNode result; - result = new LoggableElementTreeNode(parent, element, false); + result = new LoggableElementTreeNode(parent, element, remote, false); return result; }

1 0

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

14 Feb '08

Author: tchemit Date: 2008-02-14 15:38:28 +0000 (Thu, 14 Feb 2008) New Revision: 969 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java Log: ajout de la propri?\195?\169t?\195?\169 remote sur le model d'un onglet de type liste pour connaitre ?\195?\160 tout moment la provenances des objets (utilis?\195?\169 pour diff?\195?\169rencier les exports) 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-14 15:37:06 UTC (rev 968) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-14 15:38:28 UTC (rev 969) @@ -45,6 +45,8 @@ protected int selectedIndex; + protected boolean remote; + private static final long serialVersionUID = -3623331875470531459L; public String getName() { @@ -55,6 +57,10 @@ return tab; } + public boolean isRemote() { + return remote; + } + public boolean hasQuery() { return query != null && !query.isEmpty(); } @@ -92,12 +98,6 @@ return dateOrder; } - private void checkSize(int index) { - if (isEmpty() || size() < index) { - throw new IllegalStateException(getClass() + " has size " + size() + " and was required index " + index); - } - } - public boolean isOnlyLatest() { return onlyLatest; } @@ -125,7 +125,6 @@ this.tab = SimExplorerTab.valueOf(name); } - public void setList(MetaData[] list) { this.list = list; } @@ -141,6 +140,7 @@ public void initTabModel(boolean remote, SimExplorerContext context) throws Exception { // first local query, build model String query = getQuery(); + this.remote = remote; long size = StorageServiceHelper.getCount(context, remote, query, isOnlyLatest()); // init pagination PaginationModel paginationModel = new PaginationModel(); @@ -168,4 +168,10 @@ // save in model setList(data); } + + private void checkSize(int index) { + if (isEmpty() || size() < index) { + throw new IllegalStateException(getClass() + " has size " + size() + " and was required index " + index); + } + } }

1 0

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

14 Feb '08

Author: tchemit Date: 2008-02-14 15:37:06 +0000 (Thu, 14 Feb 2008) New Revision: 968 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/HistoryModel.java Log: ajout getter setter pour pouvoir modifier le contenu de l'historique depuis l'ext?\195?\169rieur (est utilis?\195?\169 par l'action de deconnexion pour supprimer de l'historique toutes les entr?\195?\169es remote) Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/HistoryModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/HistoryModel.java 2008-02-14 15:36:08 UTC (rev 967) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/HistoryModel.java 2008-02-14 15:37:06 UTC (rev 968) @@ -138,10 +138,22 @@ return size() > 0 && currentIndex < data.size() - 1; } - public boolean hastPrevious() { + public boolean hasPrevious() { return size() > 0 && currentIndex > 0; } + public List<E> getData() { + return data; + } + + public Integer getCurrentIndex() { + return currentIndex; + } + + public void setCurrentIndex(Integer currentIndex) { + this.currentIndex = currentIndex; + } + public void clear() { if (data != null) { data.clear(); @@ -172,4 +184,8 @@ currentIndex++; } } + + public boolean isEmpty() { + return size()==0; + } }

1 0

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

14 Feb '08

Author: tchemit Date: 2008-02-14 15:36:08 +0000 (Thu, 14 Feb 2008) New Revision: 967 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java Log: on specialise l'historique, TreeNode n'est pas suffisant, LoggableElementTreeNode convient mieux et fait ?\195?\169viter des casts 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-14 15:34:27 UTC (rev 966) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-14 15:36:08 UTC (rev 967) @@ -27,7 +27,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.tree.TreeNode; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -92,7 +91,7 @@ */ protected MetaData detail; - protected HistoryModel<TreeNode> history; + protected HistoryModel<LoggableElementTreeNode> history; public String getName() { return tab.name(); @@ -134,9 +133,9 @@ return detail; } - public HistoryModel<TreeNode> getHistory() { + public HistoryModel<LoggableElementTreeNode> getHistory() { if (history == null) { - history = new HistoryModel<TreeNode>(HISTORY_CAPACITY); + history = new HistoryModel<LoggableElementTreeNode>(HISTORY_CAPACITY); } return history; } @@ -175,7 +174,7 @@ firePropertyChange(Properties.SELECTED_ATTACHMENT_INDEX_PROPERTY_CHANGED, oldSelectedAttachmentIndex, selectedAttachmentIndex); } - public void clear() { + public void clear() { getHistory().clear(); reset(); }

1 0

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

14 Feb '08

Author: tchemit Date: 2008-02-14 15:34:27 +0000 (Thu, 14 Feb 2008) New Revision: 966 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java Log: introduction d'une classe pour les refresh de chaque onglet + mutualisation code. 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-14 15:33:45 UTC (rev 965) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-02-14 15:34:27 UTC (rev 966) @@ -21,7 +21,7 @@ import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerMainUI; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; +import fr.cemagref.simexplorer.is.ui.swing.MainUIRefreshHelper; import fr.cemagref.simexplorer.is.ui.swing.actions.ConnectAction; import fr.cemagref.simexplorer.is.ui.swing.util.ErrorDialog; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; @@ -146,7 +146,7 @@ boolean isConnected = context.isConnected(); // refresh ui accessibles actions - SimExplorerUIRefreshHelper.refreshConnnectState(mainUI, isConnected); + MainUIRefreshHelper.refreshConnnectState(mainUI, isConnected, null); if (isConnected) { if (conf.isShowRemoteTab()) {

1 0