AF-1987: Removing old commend and making GWTEditorNativeRegister a CD…

…I bean
kiegroup · Jul 5, 2019 · e2dd2c6 · e2dd2c6
1 parent 9cbb40a
commit e2dd2c6
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 19 deletions.
diff --git a/...h/uberfire-workbench-client/src/main/java/org/uberfire/client/mvp/ActivityBeansCache.java b/...h/uberfire-workbench-client/src/main/java/org/uberfire/client/mvp/ActivityBeansCache.java
@@ -68,6 +68,7 @@ public class ActivityBeansCache {
     private Event<NewWorkbenchScreenEvent> newWorkbenchScreenEventEvent;
     protected ResourceTypeManagerCache resourceTypeManagerCache;
     private ExperimentalActivitiesAuthorizationManager experimentalActivitiesAuthorizationManager;
+    private GWTEditorNativeRegister gwtEditorNativeRegister;
 
     public ActivityBeansCache() {
     }
@@ -77,12 +78,14 @@ public ActivityBeansCache(SyncBeanManager iocManager,
                               Event<NewPerspectiveEvent> newPerspectiveEventEvent,
                               Event<NewWorkbenchScreenEvent> newWorkbenchScreenEventEvent,
                               ResourceTypeManagerCache resourceTypeManagerCache,
-                              ExperimentalActivitiesAuthorizationManager experimentalActivitiesAuthorizationManager) {
+                              ExperimentalActivitiesAuthorizationManager experimentalActivitiesAuthorizationManager,
+                              GWTEditorNativeRegister gwtEditorNativeRegister) {
         this.iocManager = iocManager;
         this.newPerspectiveEventEvent = newPerspectiveEventEvent;
         this.newWorkbenchScreenEventEvent = newWorkbenchScreenEventEvent;
         this.resourceTypeManagerCache = resourceTypeManagerCache;
         this.experimentalActivitiesAuthorizationManager = experimentalActivitiesAuthorizationManager;
+        this.gwtEditorNativeRegister = gwtEditorNativeRegister;
     }
 
     @PostConstruct
@@ -124,11 +127,11 @@ private void put(final SyncBeanDef<Activity> activityBean,
     }
 
     void registerGwtEditorProvider() {
-        GWTEditorNativeRegister.nativeRegisterGwtEditorProvider();
+        gwtEditorNativeRegister.nativeRegisterGwtEditorProvider();
     }
 
     void registerGwtClientBean(final String id, final SyncBeanDef<Activity> activityBean) {
-        GWTEditorNativeRegister.nativeRegisterGwtClientBean(id, activityBean);
+        gwtEditorNativeRegister.nativeRegisterGwtClientBean(id, activityBean);
     }
 
     private void addResourceActivity(SyncBeanDef<Activity> activityBean,

diff --git a/...fire-workbench-client/src/main/java/org/uberfire/client/util/GWTEditorNativeRegister.java b/...fire-workbench-client/src/main/java/org/uberfire/client/util/GWTEditorNativeRegister.java
@@ -16,17 +16,18 @@
 
 package org.uberfire.client.util;
 
+import javax.enterprise.context.ApplicationScoped;
+
 import org.jboss.errai.ioc.client.container.SyncBeanDef;
 import org.uberfire.client.mvp.Activity;
 
 /**
  *  Call native Javascript to register GWT Editors
  */
+@ApplicationScoped
 public class GWTEditorNativeRegister {
 
-    private GWTEditorNativeRegister() {}
-
-    public static native void nativeRegisterGwtEditorProvider() /*-{
+    public native void nativeRegisterGwtEditorProvider() /*-{
 
         console.log("registerGWTEditorProvider");
 
@@ -69,7 +70,7 @@ public static native void nativeRegisterGwtEditorProvider() /*-{
 
     }-*/;
 
-    public static native void nativeRegisterGwtClientBean(final String id, final SyncBeanDef<Activity> activityBean) /*-{
+    public native void nativeRegisterGwtClientBean(final String id, final SyncBeanDef<Activity> activityBean) /*-{
         $wnd.gwtEditorBeans.set(id, new $wnd.GWTEditorSuplier(activityBean));
     }-*/;
 

diff --git a/...ench/uberfire-workbench-client/src/main/java/org/uberfire/client/workbench/Workbench.java b/...ench/uberfire-workbench-client/src/main/java/org/uberfire/client/workbench/Workbench.java
@@ -326,14 +326,6 @@ public PerspectiveActivity getHomePerspectiveActivity() {
         }
         // The home perspective has always priority over the default
         return homePerspective != null ? homePerspective : defaultPerspective;
-
-//        FIXME: put a flag for AFJS mode
-//        // Check access rights
-//        if (targetPerspective != null && authorizationManager.authorize(targetPerspective,
-//                                                                        identity)) {
-//            return targetPerspective;
-//        }
-//        return null;
     }
 
     @Produces

diff --git a/...bench-client/src/test/java/org/uberfire/client/mvp/ActivityBeansCacheActivatedByTest.java b/...bench-client/src/test/java/org/uberfire/client/mvp/ActivityBeansCacheActivatedByTest.java
@@ -30,6 +30,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.uberfire.client.util.GWTEditorNativeRegister;
 import org.uberfire.client.workbench.annotations.AssociatedResources;
 import org.uberfire.client.workbench.events.NewPerspectiveEvent;
 import org.uberfire.client.workbench.events.NewWorkbenchScreenEvent;
@@ -84,6 +85,9 @@ public Class<? extends ClientResourceType>[] value() {
     @Mock
     private ExperimentalActivitiesAuthorizationManager experimentalActivitiesAuthorizationManager;
 
+    @Mock
+    private GWTEditorNativeRegister gwtEditorNativeRegister;
+
     private ActiveSplashScreenActivity activeSplashScreenActivity;
     private SyncBeanDef activeSplashScreenActivityBean;
     private SyncBeanDef nonActiveSplashScreenActivityBean;
@@ -106,7 +110,8 @@ public void setup() {
                                                     newPerspectiveEventEvent,
                                                     newWorkbenchScreenEventEvent,
                                                     resourceTypeManagerCache,
-                                                    experimentalActivitiesAuthorizationManager);
+                                                    experimentalActivitiesAuthorizationManager,
+                                                    gwtEditorNativeRegister);
 
         activeSplashScreenActivity = mock(ActiveSplashScreenActivity.class);
         activeSplashScreenActivityBean = mockSplashScreenActivityBean(ActiveSplashScreenActivity.class,

diff --git a/...erfire-workbench-client/src/test/java/org/uberfire/client/mvp/ActivityBeansCacheTest.java b/...erfire-workbench-client/src/test/java/org/uberfire/client/mvp/ActivityBeansCacheTest.java
@@ -31,6 +31,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
+import org.uberfire.client.util.GWTEditorNativeRegister;
 import org.uberfire.client.workbench.events.NewPerspectiveEvent;
 import org.uberfire.client.workbench.events.NewWorkbenchScreenEvent;
 import org.uberfire.client.workbench.type.ClientResourceType;
@@ -60,6 +61,9 @@ public class ActivityBeansCacheTest {
     @Mock
     private ExperimentalActivitiesAuthorizationManager experimentalActivitiesAuthorizationManager;
 
+    @Mock
+    private GWTEditorNativeRegister gwtEditorNativeRegister;
+
     @InjectMocks
     ActivityBeansCache cache;
 
@@ -71,7 +75,8 @@ public void setUp() {
                                        newPerspectiveEventEvent,
                                        newWorkbenchScreenEvent,
                                        resourceTypeManagerCache,
-                                       experimentalActivitiesAuthorizationManager));
+                                       experimentalActivitiesAuthorizationManager,
+                                       gwtEditorNativeRegister));
 
         doNothing().when(cache).registerGwtEditorProvider();
     }

diff --git a/...re-workbench-client/src/test/java/org/uberfire/client/mvp/CategoriesManagerCacheTest.java b/...re-workbench-client/src/test/java/org/uberfire/client/mvp/CategoriesManagerCacheTest.java
@@ -29,6 +29,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
+import org.uberfire.client.util.GWTEditorNativeRegister;
 import org.uberfire.client.workbench.events.NewPerspectiveEvent;
 import org.uberfire.client.workbench.events.NewWorkbenchScreenEvent;
 import org.uberfire.client.workbench.type.ClientResourceType;
@@ -57,12 +58,16 @@ public class CategoriesManagerCacheTest {
     @Mock
     private ExperimentalActivitiesAuthorizationManager experimentalActivitiesAuthorizationManager;
 
+    @Mock
+    private GWTEditorNativeRegister gwtEditorNativeRegister;
+
     private ResourceTypeManagerCache resourceTypeManagerCache;
 
     private ActivityBeansCache activityBeansCache;
 
     private Undefined undefinedCategory;
 
+
     @Before
     public void setUp() {
         categoriesManagerCache = new CategoriesManagerCache(undefinedCategory);
@@ -71,7 +76,8 @@ public void setUp() {
                                                     newPerspectiveEventEvent,
                                                     newWorkbenchScreenEvent,
                                                     resourceTypeManagerCache,
-                                                    experimentalActivitiesAuthorizationManager);
+                                                    experimentalActivitiesAuthorizationManager,
+                                                    gwtEditorNativeRegister);
     }
 
     @Test

diff --git a/...-workbench-client/src/test/java/org/uberfire/client/mvp/ResourceTypeManagerCacheTest.java b/...-workbench-client/src/test/java/org/uberfire/client/mvp/ResourceTypeManagerCacheTest.java
@@ -35,6 +35,7 @@
 import org.mockito.runners.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 import org.uberfire.backend.vfs.Path;
+import org.uberfire.client.util.GWTEditorNativeRegister;
 import org.uberfire.client.workbench.events.NewPerspectiveEvent;
 import org.uberfire.client.workbench.events.NewWorkbenchScreenEvent;
 import org.uberfire.client.workbench.type.ClientResourceType;
@@ -74,6 +75,9 @@ public class ResourceTypeManagerCacheTest {
     @Mock
     private ExperimentalActivitiesAuthorizationManager experimentalActivitiesAuthorizationManager;
 
+    @Mock
+    private GWTEditorNativeRegister gwtEditorNativeRegister;
+
     private ActivityBeansCache activityBeansCache;
 
     private EditorDef defaultEditorDef;
@@ -104,7 +108,8 @@ public Boolean answer(InvocationOnMock invocationOnMock) throws Throwable {
                                                     newPerspectiveEventEvent,
                                                     newWorkbenchScreenEvent,
                                                     resourceTypeManagerCache,
-                                                    experimentalActivitiesAuthorizationManager);
+                                                    experimentalActivitiesAuthorizationManager,
+                                                    gwtEditorNativeRegister);
 
         modelEditorDef = registerResourceType(MODEL_CATEGORY, ModelEditorActivity.class, MODEL_TYPE, "1");
         formEditorDef = registerResourceType(FORM_CATEGORY, FormEditorActivity.class, FORM_TYPE, "2");