GitLab

at 2022-02-09T10:37:51+01:00

fix some JTree action init issue + improve DataSynchroUI

fix avdth program universe

FIXME Remove ObserveSwingDataSource service cache - See if it is better

 import java.nio.file.Path;

 import java.util.Collections;

 import java.util.Date;

-import java.util.HashMap;

 import java.util.Iterator;

 import java.util.Map;

 import java.util.Objects;

  */

 @GenerateJavaBeanDefinition

 @GenerateTemplate(template = "ObserveSwingDataSource.ftl")

-public class ObserveSwingDataSource extends AbstractJavaBean implements ObserveServicesProvider ,ObserveDataSourceConfigurationAndConnection, WithClientUIContextApi, WithPermission {

+public class ObserveSwingDataSource extends AbstractJavaBean implements ObserveServicesProvider, ObserveDataSourceConfigurationAndConnection, WithClientUIContextApi, WithPermission {

 

     private static final Logger log = LogManager.getLogger(ObserveSwingDataSource.class);

 

     private final DataSourceReferenceProvider referenceProvider;

     private final DecoratorService decoratorService;

     private final Icon icon;

-    private final Map<Class<?>, ObserveService> cache;

+    private final ObserveServicesProviderImpl servicesProvider;

+    //    private final Map<Class<?>, ObserveService> cache;

     private ProgressionModel progressModel;

-private final ObserveServicesProviderImpl servicesProvider;

     // connexion expired, but data source not closed

     private boolean expired;

     // at least one commit was performed on this data source

         this.expired = false;

         this.icon = configuration.getConnectMode().getIcon();

         //FIXME Not sure a cache here is good, any leak inside a service will stay here...

-        this.cache = new HashMap<>();

+//        this.cache = new HashMap<>();

         setProgressModel(new ProgressionModel());

         this.servicesProvider = new ObserveServicesProviderImpl(serviceFactory, this::createServiceInitializer);

     }

 

     @Override

     public <S extends ObserveService> S getService(Class<S> serviceType) {

-        @SuppressWarnings("unchecked") S result = (S) cache.get(serviceType);

-        if (result == null) {

-            result = servicesProvider.getService(serviceType);

-            cache.put(serviceType, result);

-        }

-        return result;

+//        @SuppressWarnings("unchecked") S result = (S) cache.get(serviceType);

+//        if (result == null) {

+//            result = servicesProvider.getService(serviceType);

+//            cache.put(serviceType, result);

+//        }

+//        return result;

+        return servicesProvider.getService(serviceType);

     }

 

     protected ObserveServiceInitializer createServiceInitializer() {

                 dataSourceService.close();

             }

         } finally {

-            cache.clear();

+//            cache.clear();

             ObserveUtil.cleanMemory();

             setConnection(null);

             expired = false;

         } catch (Exception e) {

             mainUI.removeBodyContent();

             throw e;

-//            UIHelper.handlingError(e);

         }

     }

 

     public void doImportAvdth() {

         if (isAlive()) {

             ImportAvdthFile action = (ImportAvdthFile) get().getNavigationUI().getImportAvdthFile().getAction();

-//            ImportAvdthFileAction action = (ImportAvdthFileAction) editorMenu.getImportAvdthFile().getAction();

             action.run();

         }

     }

     public void doCloseStorage() {

         if (isAlive()) {

             CloseStorage action = (CloseStorage) get().getNavigationUI().getCloseStorage().getAction();

-//            CloseStorageAction action = (CloseStorageAction) editorMenu.getCloseStorage().getAction();

             action.run();

         }

     }

 

     public void doReloadStorage() {

         if (isAlive()) {

-            ReloadStorage action = (ReloadStorage) get().getNavigationUI().getCloseStorage().getAction();

-//            ReloadStorageAction action = (ReloadStorageAction) editorMenu.getReloadStorage().getAction();

+            ReloadStorage action = (ReloadStorage) get().getNavigationUI().getReloadStorage().getAction();

             action.run();

         }

     }

 import java.util.Date;

 import java.util.List;

 import java.util.Objects;

+import java.util.stream.Collectors;

 

 /**

  * Created on 12/06/2021.

 

     public static ImportDialogModel create(WithClientUIContextApi clientUIContext) {

         ObserveSwingDataSource dataSource = clientUIContext.getDataSourcesManager().getMainDataSource();

-        List<ProgramReference> programs = dataSource.getReferenceProvider().getReferentialReferences(ProgramReference.class).toList();

+        // get only program for logbook

+        List<ProgramReference> programs = dataSource.getReferenceProvider().getReferentialReferences(ProgramReference.class).stream().filter(ProgramReference::isLogbook).collect(Collectors.toList());

         List<OceanReference> oceans = dataSource.getReferenceProvider().getReferentialReferences(OceanReference.class).toArrayList();

         ClientConfig clientConfig = clientUIContext.getClientConfig();

         Path temporaryDirectory = clientConfig.getTemporaryDirectory().toPath();

 

     protected void init(NavigationTree editor) {

         initializerContext.checkFirstPass();

-        UIInitHelper.init(editor);

         editor.setFont(editor.getFont().deriveFont(11f));

         editor.setCellRenderer(new NavigationTreeCellRenderer());

         NavigationUI ui = initializerContext.getUi();

...	...	@@ -216,7 +216,6 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi
216	216	} catch (Exception e) {
217	217	mainUI.removeBodyContent();
218	218	throw e;
219		-// UIHelper.handlingError(e);
220	219	}
221	220	}
222	221
...	...	@@ -235,7 +234,6 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi
235	234	public void doImportAvdth() {
236	235	if (isAlive()) {
237	236	ImportAvdthFile action = (ImportAvdthFile) get().getNavigationUI().getImportAvdthFile().getAction();
238		-// ImportAvdthFileAction action = (ImportAvdthFileAction) editorMenu.getImportAvdthFile().getAction();
239	237	action.run();
240	238	}
241	239	}
...	...	@@ -243,15 +241,13 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi
243	241	public void doCloseStorage() {
244	242	if (isAlive()) {
245	243	CloseStorage action = (CloseStorage) get().getNavigationUI().getCloseStorage().getAction();
246		-// CloseStorageAction action = (CloseStorageAction) editorMenu.getCloseStorage().getAction();
247	244	action.run();
248	245	}
249	246	}
250	247
251	248	public void doReloadStorage() {
252	249	if (isAlive()) {
253		- ReloadStorage action = (ReloadStorage) get().getNavigationUI().getCloseStorage().getAction();
254		-// ReloadStorageAction action = (ReloadStorageAction) editorMenu.getReloadStorage().getAction();
	250	+ ReloadStorage action = (ReloadStorage) get().getNavigationUI().getReloadStorage().getAction();
255	251	action.run();
256	252	}
257	253	}

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

4 changed files:

Changes: