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

r234 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is
by tchemit＠users.labs.libre-entreprise.org 20 Jan '08

20 Jan '08

Author: tchemit Date: 2008-01-20 12:09:15 +0000 (Sun, 20 Jan 2008) New Revision: 234 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorer.java Log: ajout de propri?\195?\169t?\195?\169s persitentes pour l'ui : sizor (nombre de result par page) showLocalTab : pour afficher au dm?\195?\169arrage l'onglet local showRemoteTab : pour afficher au dm?\195?\169arrage l'onglet remote showSynchTab : pour afficher au dm?\195?\169arrage l'onglet synchronize + int?\195?\169gration du service storage Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorer.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorer.java 2008-01-20 12:07:47 UTC (rev 233) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorer.java 2008-01-20 12:09:15 UTC (rev 234) @@ -18,6 +18,8 @@ * \#\#% */ package fr.cemagref.simexplorer.is; +import fr.cemagref.simexplorer.is.service.MockStorageServiceImpl; +import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.ui.swing.JConfigUI; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTabManager; import org.codelutin.i18n.I18n; @@ -34,6 +36,12 @@ /** l'ui principale de l'application */ protected static SimExplorerMainUI ui; + /** le service de données local*/ + private static StorageService remoteStorageService; + + /** le service de données distant*/ + protected static StorageService storageService; + public static SimExplorerContext getContext() { checkInitContext(); return context; @@ -89,8 +97,24 @@ * TODO ne doit être lancée que si nécessaire. */ public static void launch() { + SimExplorerMainUI mainUI = getUI(); - getUI().setVisible(true); + SimExplorerConfig conf = getContext().getConfig(); + + if (conf.isShowLocalTab()) { + // show local tab + mainUI.getToolbar().getToggleTab_local().doClick(); + } + if (conf.isShowRemoteTab()) { + // show remote tab + mainUI.getToolbar().getToggleTab_remote().doClick(); + } + if (conf.isShowSynchTab()) { + // show synchronize tab + mainUI.getToolbar().getToggleTab_synchronize().doClick(); + } + + mainUI.setVisible(true); } public static void main(String... args) throws Exception { @@ -121,4 +145,17 @@ throw new IllegalStateException("context is null, you must init first the " + SimExplorer.class.getName() + " class via init method"); } } + + public static StorageService getStorageService() { + if (storageService == null) { + storageService = new MockStorageServiceImpl(); + } + return storageService; + } + public static StorageService getRemoteStorageService() { + if (remoteStorageService == null) { + remoteStorageService = new MockStorageServiceImpl(); + } + return remoteStorageService ; + } }

1 0

r233 - trunk/simexplorer-is-swing/src/i18n
by tchemit＠users.labs.libre-entreprise.org 20 Jan '08

20 Jan '08

Author: tchemit Date: 2008-01-20 12:07:47 +0000 (Sun, 20 Jan 2008) New Revision: 233 Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties Log: ajout de propri?\195?\169t?\195?\169s persitentes pour l'ui : sizor (nombre de result par page) showLocalTab : pour afficher au dm?\195?\169arrage l'onglet local showRemoteTab : pour afficher au dm?\195?\169arrage l'onglet remote showSynchTab : pour afficher au dm?\195?\169arrage l'onglet synchronize Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-20 12:05:54 UTC (rev 232) +++ trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-20 12:07:47 UTC (rev 233) @@ -1,4 +1,4 @@ -#Sun Jan 20 11:54:41 GMT 2008 +#Sun Jan 20 12:07:28 GMT 2008 can\ not\ find\ a\ registered\ action\ for\ key\ {0}\ = could\ not\ found\ for\ action\ key\ {0}\ class\ {1}\ = could\ not\ load\ actions.properties\ file\ for\ reason\ {0}\ = @@ -61,6 +61,9 @@ simexplorer.config.main.lastName.description=Le nom de l'utilisateur simexplorer.config.main.login.description=User login to remote server simexplorer.config.main.serverURL.description=URL of the remote server +simexplorer.config.main.showLocalTab.description=Show at launch time, the local tab +simexplorer.config.main.showRemoteTab.description=Show at launch time, the remote tab +simexplorer.config.main.showSynchTab.description=Show at launch time, the synchronize tab simexplorer.config.main.sizor.description=number of result by page in ui simexplorer.config.main.userMail.description=Le courriel de l'utilisateur simexplorer.config.main.version.description=La version de l'application Modified: trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties 2008-01-20 12:05:54 UTC (rev 232) +++ trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties 2008-01-20 12:07:47 UTC (rev 233) @@ -1,4 +1,4 @@ -#Sun Jan 20 11:54:41 GMT 2008 +#Sun Jan 20 12:07:28 GMT 2008 can\ not\ find\ a\ registered\ action\ for\ key\ {0}\ = could\ not\ found\ for\ action\ key\ {0}\ class\ {1}\ = could\ not\ load\ actions.properties\ file\ for\ reason\ {0}\ = @@ -61,6 +61,9 @@ simexplorer.config.main.lastName.description=Le nom de l'utilisateur simexplorer.config.main.login.description=Le login de l'utilisateur simexplorer.config.main.serverURL.description=l'url du serveur distant +simexplorer.config.main.showLocalTab.description=Voir au d\u00E9marrage l'onglet Local +simexplorer.config.main.showRemoteTab.description=Voir au d\u00E9mrrage l'onglet Distant +simexplorer.config.main.showSynchTab.description=Voir au d\u00E9marrage l'onglet Synchro simexplorer.config.main.sizor.description=Nombre de r\u00E9sultats par page dans l'ui simexplorer.config.main.userMail.description=Le courriel de l'utilisateur simexplorer.config.main.version.description=La version du logiciel

1 0

r232 - trunk/simexplorer-is-swing/src/resources
by tchemit＠users.labs.libre-entreprise.org 20 Jan '08

20 Jan '08

Author: tchemit Date: 2008-01-20 12:05:54 +0000 (Sun, 20 Jan 2008) New Revision: 232 Modified: trunk/simexplorer-is-swing/src/resources/commandline.properties Log: ajout de propri?\195?\169t?\195?\169s persitentes pour l'ui : sizor (nombre de result par page) showLocalTab : pour afficher au dm?\195?\169arrage l'onglet local showRemoteTab : pour afficher au dm?\195?\169arrage l'onglet remote showSynchTab : pour afficher au dm?\195?\169arrage l'onglet synchronize Modified: trunk/simexplorer-is-swing/src/resources/commandline.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/commandline.properties 2008-01-20 11:56:06 UTC (rev 231) +++ trunk/simexplorer-is-swing/src/resources/commandline.properties 2008-01-20 12:05:54 UTC (rev 232) @@ -52,3 +52,15 @@ main.config.definition.version=org.codelutin.util.VersionNumber:0.0.1 main.config.modifiers.version=final,static,mandatory + +main.config.definition.sizor=java.lang.Integer:10 +main.config.modifiers.sizor= + +main.config.definition.showLocalTab=java.lang.Boolean:True +main.config.modifiers.showLocalTab= + +main.config.definition.showRemoteTab=java.lang.Boolean:False +main.config.modifiers.showRemoteTab= + +main.config.definition.showSynchTab=java.lang.Boolean:False +main.config.modifiers.showSynchTab=

1 0

r231 - trunk/simexplorer-is-swing/src/resources
by tchemit＠users.labs.libre-entreprise.org 20 Jan '08

20 Jan '08

Author: tchemit Date: 2008-01-20 11:56:06 +0000 (Sun, 20 Jan 2008) New Revision: 231 Modified: trunk/simexplorer-is-swing/src/resources/actions.properties Log: ajout d'actions + d?\195?\169placement d'une action ShowTab (?\195?\160 finir les autres closeTab) Modified: trunk/simexplorer-is-swing/src/resources/actions.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/actions.properties 2008-01-20 11:55:19 UTC (rev 230) +++ trunk/simexplorer-is-swing/src/resources/actions.properties 2008-01-20 11:56:06 UTC (rev 231) @@ -11,10 +11,10 @@ action.closeTab_detail=fr.cemagref.simexplorer.is.ui.swing.SimExplorerTabManager$CloseTabAction action.closeTab_synchronize=fr.cemagref.simexplorer.is.ui.swing.SimExplorerTabManager$CloseTabAction -action.showTab_local=fr.cemagref.simexplorer.is.ui.swing.SimExplorerTabManager$ShowTabAction -action.showTab_remote=fr.cemagref.simexplorer.is.ui.swing.SimExplorerTabManager$ShowTabAction -action.showTab_detail=fr.cemagref.simexplorer.is.ui.swing.SimExplorerTabManager$ShowTabAction -action.showTab_synchronize=fr.cemagref.simexplorer.is.ui.swing.SimExplorerTabManager$ShowTabAction +action.showTab_local=fr.cemagref.simexplorer.is.ui.swing.actions.ShowTabAction +action.showTab_remote=fr.cemagref.simexplorer.is.ui.swing.actions.ShowTabAction +action.showTab_detail=fr.cemagref.simexplorer.is.ui.swing.actions.ShowTabAction +action.showTab_synchronize=fr.cemagref.simexplorer.is.ui.swing.actions.ShowTabAction action.toggleTab_local=fr.cemagref.simexplorer.is.ui.swing.SimExplorerTabManager$ToggleTabAction action.toggleTab_remote=fr.cemagref.simexplorer.is.ui.swing.SimExplorerTabManager$ToggleTabAction @@ -22,6 +22,16 @@ action.config=fr.cemagref.simexplorer.is.ui.swing.actions.ConfigAction +action.searchApplication=fr.cemagref.simexplorer.is.ui.swing.actions.SearchApplicationAction +action.resetSearchApplication=fr.cemagref.simexplorer.is.ui.swing.actions.ResetSearchApplicationAction + +action.collapseAll=fr.cemagref.simexplorer.is.ui.swing.actions.CollapseAllAction +action.expandAll=fr.cemagref.simexplorer.is.ui.swing.actions.ExpandAllAction + +action.exportApplication=fr.cemagref.simexplorer.is.ui.swing.actions.ExportApplicationAction +action.importApplication=fr.cemagref.simexplorer.is.ui.swing.actions.ImportApplicationAction +action.launchSynchronize=fr.cemagref.simexplorer.is.ui.swing.actions.LaunchSynchronizeAction + #action.groups=fr.cemagref.simexplorer.is.ui.swing.actions.GroupsAction #action.users=fr.cemagref.simexplorer.is.ui.swing.actions.UsersAction

1 0

r230 - trunk/simexplorer-is-swing/src/i18n
by tchemit＠users.labs.libre-entreprise.org 20 Jan '08

20 Jan '08

Author: tchemit Date: 2008-01-20 11:55:19 +0000 (Sun, 20 Jan 2008) New Revision: 230 Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties Log: i18n divers Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-20 11:51:57 UTC (rev 229) +++ trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-20 11:55:19 UTC (rev 230) @@ -1,9 +1,10 @@ -#Sat Jan 19 14:02:13 GMT 2008 +#Sun Jan 20 11:54:41 GMT 2008 can\ not\ find\ a\ registered\ action\ for\ key\ {0}\ = could\ not\ found\ for\ action\ key\ {0}\ class\ {1}\ = could\ not\ load\ actions.properties\ file\ for\ reason\ {0}\ = simexplorer.action.advancedSearch=Advanced search simexplorer.action.advancedSearch.tooltip=Show advanced search dialog +simexplorer.action.closeTab.tooltip=close the tab simexplorer.action.collapseAll.tooltip=Collapse all nodes simexplorer.action.expandAll.tooltip=Expand all nodes simexplorer.action.exportApplication=export @@ -37,8 +38,14 @@ simexplorer.admin.menu.users.tooltip=Show Users admin screen simexplorer.change.config.property= simexplorer.common.cancel=cancel +simexplorer.common.create.date=creation date +simexplorer.common.description=description +simexplorer.common.name=name simexplorer.common.ok=ok simexplorer.common.reset=reset +simexplorer.common.type=type +simexplorer.common.uuid=uuid +simexplorer.common.version=version simexplorer.config.i18n.menu=I18n simexplorer.config.i18n.menu.en=English simexplorer.config.i18n.menu.en.tooltip=Change to english language @@ -54,6 +61,7 @@ simexplorer.config.main.lastName.description=Le nom de l'utilisateur simexplorer.config.main.login.description=User login to remote server simexplorer.config.main.serverURL.description=URL of the remote server +simexplorer.config.main.sizor.description=number of result by page in ui simexplorer.config.main.userMail.description=Le courriel de l'utilisateur simexplorer.config.main.version.description=La version de l'application simexplorer.config.menu=Configuration Modified: trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties 2008-01-20 11:51:57 UTC (rev 229) +++ trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties 2008-01-20 11:55:19 UTC (rev 230) @@ -1,9 +1,10 @@ -#Sat Jan 19 14:02:13 GMT 2008 +#Sun Jan 20 11:54:41 GMT 2008 can\ not\ find\ a\ registered\ action\ for\ key\ {0}\ = could\ not\ found\ for\ action\ key\ {0}\ class\ {1}\ = could\ not\ load\ actions.properties\ file\ for\ reason\ {0}\ = simexplorer.action.advancedSearch=Recherche avanc\u00E9e simexplorer.action.advancedSearch.tooltip=Cliquer pour afficher le recherche avanc\u00E9e +simexplorer.action.closeTab.tooltip=Fermer l'onglet simexplorer.action.collapseAll.tooltip=R\u00E9duire tous les noeuds simexplorer.action.expandAll.tooltip=Expander tous les noeuds simexplorer.action.exportApplication=exporter @@ -37,8 +38,14 @@ simexplorer.admin.menu.users.tooltip=Afficher le gestionnaire des utilisateurs simexplorer.change.config.property= simexplorer.common.cancel=annuler +simexplorer.common.create.date=date de cr\u00E9ation +simexplorer.common.description=description +simexplorer.common.name=nom simexplorer.common.ok=appliquer simexplorer.common.reset=r\u00E9initialiser +simexplorer.common.type=type +simexplorer.common.uuid=uuid +simexplorer.common.version=version simexplorer.config.i18n.menu=Langue simexplorer.config.i18n.menu.en=Anglais simexplorer.config.i18n.menu.en.tooltip= @@ -54,6 +61,7 @@ simexplorer.config.main.lastName.description=Le nom de l'utilisateur simexplorer.config.main.login.description=Le login de l'utilisateur simexplorer.config.main.serverURL.description=l'url du serveur distant +simexplorer.config.main.sizor.description=Nombre de r\u00E9sultats par page dans l'ui simexplorer.config.main.userMail.description=Le courriel de l'utilisateur simexplorer.config.main.version.description=La version du logiciel simexplorer.config.menu=Configuration

1 0

r229 - in trunk/simexplorer-is-storage/src: java/fr/cemagref/simexplorer/is/storage test/fr/cemagref/simexplorer/is/storage/test
by tchemit＠users.labs.libre-entreprise.org 20 Jan '08

20 Jan '08

Author: tchemit Date: 2008-01-20 11:51:57 +0000 (Sun, 20 Jan 2008) New Revision: 229 Added: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java Removed: trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/MetaDataGenerator.java Modified: trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseLoadTestCase.java trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseThread.java Log: deplacement du g?\195?\169n?\195?\169rateur de meta donn?\195?\169es pour pouvoir l'utiliser dans le service bouchon?\195?\169 Copied: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java (from rev 227, trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/MetaDataGenerator.java) =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java (rev 0) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-01-20 11:51:57 UTC (rev 229) @@ -0,0 +1,95 @@ +package fr.cemagref.simexplorer.is.storage; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.Random; +import java.util.UUID; + +import fr.cemagref.simexplorer.is.contenttype.ContentType; +import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.Version; + +public class MetaDataGenerator { + + Random r = new Random(); + + /* + * private static boolean descriptorFieldsInit = false; private static + * String[] descriptorFields; + * + * private static void generateDescriptors() { descriptorFields = new + * String[10]; for (int i = 0; i < descriptorFields.length; i++) { + * descriptorFields[i] = "descriptor" + i; } } + */ + + public MetaDataEntity generateMetaDataEntity(String uuid, Version version, + MetaDataEntity parentVersion, MetaDataEntity parentData) { + MetaDataEntity me = generateMetaDataEntity(uuid, version, parentVersion); + if (parentData != null) { + me.setParentDataUuid(parentData.getUuid()); + me.setParentDataVersion(parentData.getVersion().toString()); + } + return me; + } + + public MetaDataEntity generateMetaDataEntity(String uuid, Version version, + MetaDataEntity parentVersion) { + MetaDataEntity me = generateMetaDataEntity(uuid, version); + + if (parentVersion != null) { + me.setParentVersionUuid(parentVersion.getUuid()); + me.setParentVersionVersion(parentVersion.getVersion().toString()); + parentVersion.setLatest(false); + } + me.setLatest(true); + + return me; + } + + public MetaDataEntity generateMetaDataEntity(String uuid, Version version) { + MetaDataEntity me = new MetaDataEntity(); + + me.setUuid(uuid); + me.setName(uuid); + me.setType("LuceneDatabaseTestCase"); + me.setDescription(uuid + " " + version.toString()); + me.setVersion(version.toString()); + me.setLatest(true); + me.setCreationDate(new Date()); + me.setHash(UUID.randomUUID().toString()); + + Map<String, String> descriptors = new HashMap<String, String>(); + descriptors.put("overallId", uuid); + int i = 5 + r.nextInt(10); + for (int j = 0; j < i; j++) { + descriptors.put("descriptor" + j, UUID.randomUUID().toString()); + } + me.setDescriptors(descriptors); + me.setAttachments(new HashMap<String, ContentType>()); + me.setParentDataUuid(null); + me.setParentDataVersion(null); + me.setParentVersionUuid(null); + me.setParentVersionVersion(null); + + return me; + } + + public MetaDataEntity generateMetaDataEntity() { + return generateMetaDataEntity(UUID.randomUUID().toString(), + new Version("1.0")); + } + + public MetaDataEntity[] generateVersionnedMetaDataEntity() { + String uuid = UUID.randomUUID().toString(); + + MetaDataEntity[] mes = new MetaDataEntity[4]; + mes[0] = generateMetaDataEntity(uuid, new Version("1.0")); + mes[1] = generateMetaDataEntity(uuid, new Version("1.1"), mes[0]); + mes[2] = generateMetaDataEntity(uuid, new Version("1.2"), mes[1]); + mes[3] = generateMetaDataEntity(uuid, new Version("2.0"), mes[2]); + + return mes; + } + +} Modified: trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseLoadTestCase.java =================================================================== --- trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseLoadTestCase.java 2008-01-20 11:51:03 UTC (rev 228) +++ trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseLoadTestCase.java 2008-01-20 11:51:57 UTC (rev 229) @@ -12,6 +12,7 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.storage.database.Database; import fr.cemagref.simexplorer.is.storage.database.lucene.LuceneDatabase; +import fr.cemagref.simexplorer.is.storage.MetaDataGenerator; public class LuceneDatabaseLoadTestCase extends TestCase { Modified: trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java =================================================================== --- trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java 2008-01-20 11:51:03 UTC (rev 228) +++ trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java 2008-01-20 11:51:57 UTC (rev 229) @@ -13,6 +13,7 @@ import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.storage.database.Database; import fr.cemagref.simexplorer.is.storage.database.lucene.LuceneDatabase; +import fr.cemagref.simexplorer.is.storage.MetaDataGenerator; public class LuceneDatabaseTestCase extends TestCase { Modified: trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseThread.java =================================================================== --- trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseThread.java 2008-01-20 11:51:03 UTC (rev 228) +++ trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseThread.java 2008-01-20 11:51:57 UTC (rev 229) @@ -7,6 +7,7 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.storage.database.Database; +import fr.cemagref.simexplorer.is.storage.MetaDataGenerator; public class LuceneDatabaseThread extends Thread { Deleted: trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/MetaDataGenerator.java =================================================================== --- trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/MetaDataGenerator.java 2008-01-20 11:51:03 UTC (rev 228) +++ trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/MetaDataGenerator.java 2008-01-20 11:51:57 UTC (rev 229) @@ -1,95 +0,0 @@ -package fr.cemagref.simexplorer.is.storage.test; - -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.Random; -import java.util.UUID; - -import fr.cemagref.simexplorer.is.contenttype.ContentType; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; -import fr.cemagref.simexplorer.is.entities.metadata.Version; - -public class MetaDataGenerator { - - Random r = new Random(); - - /* - * private static boolean descriptorFieldsInit = false; private static - * String[] descriptorFields; - * - * private static void generateDescriptors() { descriptorFields = new - * String[10]; for (int i = 0; i < descriptorFields.length; i++) { - * descriptorFields[i] = "descriptor" + i; } } - */ - - public MetaDataEntity generateMetaDataEntity(String uuid, Version version, - MetaDataEntity parentVersion, MetaDataEntity parentData) { - MetaDataEntity me = generateMetaDataEntity(uuid, version, parentVersion); - if (parentData != null) { - me.setParentDataUuid(parentData.getUuid()); - me.setParentDataVersion(parentData.getVersion().toString()); - } - return me; - } - - public MetaDataEntity generateMetaDataEntity(String uuid, Version version, - MetaDataEntity parentVersion) { - MetaDataEntity me = generateMetaDataEntity(uuid, version); - - if (parentVersion != null) { - me.setParentVersionUuid(parentVersion.getUuid()); - me.setParentVersionVersion(parentVersion.getVersion().toString()); - parentVersion.setLatest(false); - } - me.setLatest(true); - - return me; - } - - public MetaDataEntity generateMetaDataEntity(String uuid, Version version) { - MetaDataEntity me = new MetaDataEntity(); - - me.setUuid(uuid); - me.setName(uuid); - me.setType("LuceneDatabaseTestCase"); - me.setDescription(uuid + " " + version.toString()); - me.setVersion(version.toString()); - me.setLatest(true); - me.setCreationDate(new Date()); - me.setHash(UUID.randomUUID().toString()); - - Map<String, String> descriptors = new HashMap<String, String>(); - descriptors.put("overallId", uuid); - int i = 5 + r.nextInt(10); - for (int j = 0; j < i; j++) { - descriptors.put("descriptor" + j, UUID.randomUUID().toString()); - } - me.setDescriptors(descriptors); - me.setAttachments(new HashMap<String, ContentType>()); - me.setParentDataUuid(null); - me.setParentDataVersion(null); - me.setParentVersionUuid(null); - me.setParentVersionVersion(null); - - return me; - } - - public MetaDataEntity generateMetaDataEntity() { - return generateMetaDataEntity(UUID.randomUUID().toString(), - new Version("1.0")); - } - - public MetaDataEntity[] generateVersionnedMetaDataEntity() { - String uuid = UUID.randomUUID().toString(); - - MetaDataEntity[] mes = new MetaDataEntity[4]; - mes[0] = generateMetaDataEntity(uuid, new Version("1.0")); - mes[1] = generateMetaDataEntity(uuid, new Version("1.1"), mes[0]); - mes[2] = generateMetaDataEntity(uuid, new Version("1.2"), mes[1]); - mes[3] = generateMetaDataEntity(uuid, new Version("2.0"), mes[2]); - - return mes; - } - -}

1 0

r228 - trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 20 Jan '08

20 Jan '08

Author: tchemit Date: 2008-01-20 11:51:03 +0000 (Sun, 20 Jan 2008) New Revision: 228 Added: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java Log: un service bouchon?\195?\169 (je ne le mets dans les tests pour l'instant car je m'en sers dans le module ui-swing pour construire l'ui) Added: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java (rev 0) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-01-20 11:51:03 UTC (rev 228) @@ -0,0 +1,96 @@ +/* +* \#\#% 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.service; + +import com.healthmarketscience.rmiio.RemoteInputStream; +import com.healthmarketscience.rmiio.RemoteOutputStream; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.storage.MetaDataGenerator; + +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; + +/** @author tony */ +public class MockStorageServiceImpl implements StorageService { + + static final int SIZE = 200; + SortedMap<String, MetaDataEntity> mockData; + + public SortedMap<String, MetaDataEntity> mockData() { + if (mockData == null) { + mockData = new TreeMap<String, MetaDataEntity>(); + MetaDataGenerator generator = new MetaDataGenerator(); + for (int i = 0; i < SIZE; i++) { + MetaDataEntity metaDataEntity = generator.generateMetaDataEntity(); + mockData.put(metaDataEntity.getUuid(), metaDataEntity); + } + } + return mockData; + } + + public void commit() throws Exception { + checkImplemented(); + } + + private Object checkImplemented() { + throw new IllegalStateException("not implemented"); + } + + public MetaDataEntity saveElement(RemoteInputStream zipRemoteStream) throws Exception { + return (MetaDataEntity) checkImplemented(); + } + + public MetaDataEntity saveElement(RemoteInputStream xmlRemoteStream, Map<String, RemoteInputStream> attachmentsRemoteStream) throws Exception { + return (MetaDataEntity) checkImplemented(); + } + + public MetaDataEntity getMetadata(String uuid) throws Exception { + return mockData().get(uuid); + } + + public MetaDataEntity getMetadata(String uuid, String version) throws Exception { + return null; + } + + public void exportElement(RemoteOutputStream xmlOutputStream, String uuid, String version) throws Exception { + checkImplemented(); + } + + public int findFullTextCount(String query, boolean onlyLatest) throws Exception { + return (Integer) checkImplemented(); + } + + public MetaDataEntity[] findFullText(String query, boolean onlyLatest, int indexStart, int count, int dateOrder) throws Exception { + return (MetaDataEntity[]) checkImplemented(); + } + + public int findApplicationsCount(boolean onlyLatest) throws Exception { + return mockData().size(); + } + + public MetaDataEntity[] findApplications(boolean onlyLatest, int start, int count, int dateOrder) throws Exception { + return (MetaDataEntity[]) checkImplemented(); + } + + public LoggableElement getElement(String uuid, String version) throws Exception { + return (LoggableElement) checkImplemented(); + } +}

1 0

r227 - in trunk/simexplorer-is-swing/src/resources: . icons
by tchemit＠users.labs.libre-entreprise.org 19 Jan '08

19 Jan '08

Author: tchemit Date: 2008-01-19 14:54:59 +0000 (Sat, 19 Jan 2008) New Revision: 227 Added: trunk/simexplorer-is-swing/src/resources/icons/ trunk/simexplorer-is-swing/src/resources/icons/collapseall.png trunk/simexplorer-is-swing/src/resources/icons/expandall.png trunk/simexplorer-is-swing/src/resources/icons/fileChooser.png trunk/simexplorer-is-swing/src/resources/icons/help.png trunk/simexplorer-is-swing/src/resources/icons/save.png trunk/simexplorer-is-swing/src/resources/icons/sync.png Log: quelques icones, en attendant d'avoir un jeu d?\195?\169finitif Added: trunk/simexplorer-is-swing/src/resources/icons/collapseall.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/collapseall.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/expandall.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/expandall.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/fileChooser.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/fileChooser.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/help.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/help.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/save.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/save.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/sync.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/sync.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream

1 0

r226 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 19 Jan '08

19 Jan '08

Author: tchemit Date: 2008-01-19 14:54:04 +0000 (Sat, 19 Jan 2008) New Revision: 226 Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx Log: ajout toolbar, actions sur les onglets Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-01-19 14:52:52 UTC (rev 225) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-01-19 14:54:04 UTC (rev 226) @@ -14,11 +14,17 @@ text='{_("simexplorer.main.menu.unconnect")}' toolTipText='{_("simexplorer.main.menu.unconnect.tooltip")}'/> <JSeparator/> - <JMenuItem id="listApplications" enabled='false' - text='{_("simexplorer.main.menu.list.applications")}' - toolTipText='{_("simexplorer.main.menu.list.applications.tooltip")}'/> + <JMenuItem id="showTab_local" enabled='false' + text='{_("simexplorer.main.menu.show.local")}' + toolTipText='{_("simexplorer.main.menu.show.local.tooltip")}'/> + <JMenuItem id="showTab_remote" enabled='false' + text='{_("simexplorer.main.menu.show.remote")}' + toolTipText='{_("simexplorer.main.menu.show.remote.tooltip")}'/> + <JMenuItem id="showTab_synchronize" enabled='false' + text='{_("simexplorer.main.menu.synchronize")}' + toolTipText='{_("simexplorer.main.menu.synchronize.tooltip")}'/> <JSeparator/> - <JMenuItem id="quit" enabled='false' + <JMenuItem id="quit" enabled='false' text='{_("simexplorer.main.menu.quit")}' toolTipText='{_("simexplorer.main.menu.quit.tooltip")}'/> </JMenu> @@ -34,8 +40,7 @@ </JMenu> <JMenuItem id="config" enabled='false' text='{_("simexplorer.config.menu.config")}' - toolTipText='{_("simexplorer.config.menu.config.tooltip")}' - /> + toolTipText='{_("simexplorer.config.menu.config.tooltip")}' /> </JMenu>  <JMenu text='{_("simexplorer.admin.menu")}'> @@ -59,11 +64,19 @@ toolTipText='{_("simexplorer.help.menu.about.tooltip")}'/> </JMenu> </JMenuBar> + <Table> +  + <row> + <cell fill="both"> + <fr.cemagref.simexplorer.is.ui.swing.toolbar.JSimExplorerToolbar id='toolbar'/> + </cell> + </row>  <row fill="both" weightx="1" weighty="1"> <cell> - <JPanel id="content"/> + <JTabbedPane id="content"/> +  </cell> </row>

1 0

r225 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 19 Jan '08

19 Jan '08

Author: tchemit Date: 2008-01-19 14:52:52 +0000 (Sat, 19 Jan 2008) New Revision: 225 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java Log: utilisation d'un JTabbedPane g?\195?\169n?\195?\169riqu au lieu d'une classe fille qui ne sert ?\195?\160 rien Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java 2008-01-19 14:45:15 UTC (rev 224) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java 2008-01-19 14:52:52 UTC (rev 225) @@ -45,28 +45,28 @@ public enum Tab { - @TabContent(impl = JApplicationDetailTab.class, parentImpl = JTabContainer.class) + @TabContent(impl = JApplicationDetailTab.class, parentImpl = JTabbedPane.class) detail(n_("simexplorer.tab.detail"), n_("simexplorer.tab.detail.tooltip")) { public JApplicationDetailTab get() { return (JApplicationDetailTab) get0(); } }, - @TabContent(impl = JApplicationListTab.class, parentImpl = JTabContainer.class, useToogle = true) + @TabContent(impl = JApplicationListTab.class, parentImpl = JTabbedPane.class, useToogle = true) local(n_("simexplorer.tab.local"), n_("simexplorer.tab.local.tooltip")) { public JApplicationListTab get() { return (JApplicationListTab) get0(); } }, - @TabContent(impl = JApplicationListTab.class, parentImpl = JTabContainer.class, useToogle = true) + @TabContent(impl = JApplicationListTab.class, parentImpl = JTabbedPane.class, useToogle = true) remote(n_("simexplorer.tab.remote"), n_("simexplorer.tab.remote.tooltip")) { public JApplicationListTab get() { return (JApplicationListTab) get0(); } }, - @TabContent(impl = JApplicationSynchronizeTab.class, parentImpl = JTabContainer.class, useToogle = true) + @TabContent(impl = JApplicationSynchronizeTab.class, parentImpl = JTabbedPane.class, useToogle = true) synchronize(n_("simexplorer.tab.synchronize"), n_("simexplorer.tab.synchronize.tooltip")) { public JApplicationSynchronizeTab get() { return (JApplicationSynchronizeTab) get0(); @@ -222,7 +222,7 @@ public static void main(String[] args) { SimExplorer.init(); - JTabContainer container = SimExplorer.getUI().getContent(); + JTabbedPane container = SimExplorer.getUI().getContent(); JDialog dialog = new JDialog(); dialog.setSize(800, 600);

1 0