- this is the merge of kiegroup#16 by porcelli

- This PR doesn't fix the Stanalone project compilation problems
cristianonicolai · Feb 25, 2013 · efe680a · efe680a
1 parent f050a04
commit efe680a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/...a/org/jbpm/designer/client/Bpmn2Type.java → ...pm/designer/type/Bpmn2TypeDefinition.java b/...a/org/jbpm/designer/client/Bpmn2Type.java → ...pm/designer/type/Bpmn2TypeDefinition.java
@@ -1,13 +1,12 @@
-package org.jbpm.designer.client;
+package org.jbpm.designer.type;
 
 import javax.enterprise.context.ApplicationScoped;
 
-import com.google.gwt.user.client.ui.IsWidget;
 import org.uberfire.backend.vfs.Path;
-import org.uberfire.client.workbench.file.ResourceType;
+import org.uberfire.shared.workbench.type.ResourceTypeDefinition;
 
 @ApplicationScoped
-public class Bpmn2Type implements ResourceType {
+public class Bpmn2TypeDefinition implements ResourceTypeDefinition {
 
     @Override
     public String getShortName() {
@@ -19,11 +18,6 @@ public String getDescription() {
         return "BPMN2 file";
     }
 
-    @Override
-    public IsWidget getIcon() {
-        return null;
-    }
-
     @Override
     public String getPrefix() {
         return "";

diff --git a/jbpm-designer-client/src/main/java/org/jbpm/designer/client/DesignerPresenter.java b/jbpm-designer-client/src/main/java/org/jbpm/designer/client/DesignerPresenter.java
@@ -8,6 +8,7 @@
 import com.google.gwt.user.client.ui.IsWidget;
 import org.jboss.errai.bus.client.api.RemoteCallback;
 import org.jboss.errai.ioc.client.api.Caller;
+import org.jbpm.designer.client.type.Bpmn2Type;
 import org.jbpm.designer.service.DesignerAssetService;
 import org.uberfire.backend.vfs.Path;
 import org.uberfire.client.annotations.OnStart;

diff --git a/jbpm-designer-client/src/main/java/org/jbpm/designer/client/handlers/NewProcessHandler.java b/jbpm-designer-client/src/main/java/org/jbpm/designer/client/handlers/NewProcessHandler.java
@@ -7,7 +7,7 @@
 import com.google.gwt.user.client.ui.IsWidget;
 import org.jboss.errai.bus.client.api.RemoteCallback;
 import org.jboss.errai.ioc.client.api.Caller;
-import org.jbpm.designer.client.Bpmn2Type;
+import org.jbpm.designer.client.type.Bpmn2Type;
 import org.jbpm.designer.service.DesignerAssetService;
 import org.kie.guvnor.commons.ui.client.handlers.DefaultNewResourceHandler;
 import org.uberfire.backend.vfs.Path;

diff --git a/jbpm-designer-client/src/main/java/org/jbpm/designer/client/type/Bpmn2Type.java b/jbpm-designer-client/src/main/java/org/jbpm/designer/client/type/Bpmn2Type.java
@@ -0,0 +1,18 @@
+package org.jbpm.designer.client.type;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import com.google.gwt.user.client.ui.IsWidget;
+import org.jbpm.designer.type.Bpmn2TypeDefinition;
+import org.uberfire.client.workbench.type.ClientResourceType;
+
+@ApplicationScoped
+public class Bpmn2Type
+        extends Bpmn2TypeDefinition
+        implements ClientResourceType {
+
+    @Override
+    public IsWidget getIcon() {
+        return null;
+    }
+}