fixed #9

lefloh · Jul 23, 2012 · 4140820 · 4140820
1 parent 9c51e79
commit 4140820
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 97 deletions.
diff --git a/src/main/java/de/adorsys/forge/gwt/GWTFacet.java b/src/main/java/de/adorsys/forge/gwt/GWTFacet.java
@@ -111,7 +111,6 @@ public void setupMVP4G() {
 		createJavaSource("EntryPoint.java.vm");
 		createJavaSource("EventBus.java.vm");
 		createJavaSource("GinClientModule.java.vm");
-		createJavaSource("ReverseCompositeView.java.vm");
 		createMVPWelcome();
 	}
 
@@ -140,10 +139,9 @@ private JavaResource createMVPWelcome() {
 		contextData.put("nameClassPrefix", nameClassPrefix);
 		contextData.put("name", name);
 
-		JavaResource presenter = createJavaSource("mvp/PresenterImpl.java.vm", contextData);
+		JavaResource presenter = createJavaSource("mvp/Presenter.java.vm", contextData);
 		createJavaSource("mvp/View.java.vm", contextData);
-		createJavaSource("mvp/ViewImpl.java.vm", contextData);
-		createResource("mvp/Welcome.ui.xml.vm", String.format("%s/%sViewImpl.ui.xml", name, nameClassPrefix));
+		createResource("mvp/Welcome.ui.xml.vm", String.format("%s/%sView.ui.xml", name, nameClassPrefix));
 		return presenter;
 	}
 
@@ -154,10 +152,9 @@ public JavaResource createMVP(String name) {
 		contextData.put("nameClassPrefix", nameClassPrefix);
 		contextData.put("name", name);
 
-		JavaResource presenter = createJavaSource("mvp/PresenterImpl.java.vm", contextData);
+		JavaResource presenter = createJavaSource("mvp/Presenter.java.vm", contextData);
 		createJavaSource("mvp/View.java.vm", contextData);
-		createJavaSource("mvp/ViewImpl.java.vm", contextData);
-		createResource("mvp/ViewImpl.ui.xml.vm", String.format("%s/%sViewImpl.ui.xml", name, nameClassPrefix));
+		createResource("mvp/View.ui.xml.vm", String.format("%s/%sView.ui.xml", name, nameClassPrefix));
 		return presenter;
 	}
 

diff --git a/src/main/resources/EventBus.java.vm b/src/main/resources/EventBus.java.vm
@@ -23,9 +23,9 @@ import com.mvp4g.client.annotation.InitHistory;
 import com.mvp4g.client.annotation.Start;
 import com.mvp4g.client.event.EventBusWithLookup;
 
-import ${basePackage}.application.ApplicationPresenterImpl;
+import ${basePackage}.application.ApplicationPresenter;
 
-@Events(startPresenter=ApplicationPresenterImpl.class, ginModules=${classPrefix}GinClientModule.class)
+@Events(startPresenter=ApplicationPresenter.class, ginModules=${classPrefix}GinClientModule.class)
 public interface ${classPrefix}EventBus extends EventBusWithLookup {
 
 	@Start

diff --git a/src/main/resources/ReverseCompositeView.java.vm b/src/main/resources/ReverseCompositeView.java.vm
diff --git a/src/main/resources/index.html.vm b/src/main/resources/index.html.vm
@@ -20,7 +20,6 @@
 		<meta name="keywords" content="" />
 		<title>${title}</title>
 		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-		<link rel="stylesheet" type="text/css" href="style.css" />
 		<script type="text/javascript" language="javascript" src="${gwt.moduleNameStandalone}/${gwt.moduleNameStandalone}.nocache.js"></script>
 	</head>
 	<body>

diff --git a/src/main/resources/mvp/PresenterImpl.java.vm → src/main/resources/mvp/Presenter.java.vm b/src/main/resources/mvp/PresenterImpl.java.vm → src/main/resources/mvp/Presenter.java.vm
@@ -21,9 +21,8 @@ import com.mvp4g.client.annotation.Presenter;
 import com.mvp4g.client.presenter.BasePresenter;
 
 import ${basePackage}.${classPrefix}EventBus;
-import ${basePackage}.${name}.${nameClassPrefix}View.${nameClassPrefix}Presenter;
 
-@Presenter( view = ${nameClassPrefix}ViewImpl.class )
-public class ${nameClassPrefix}PresenterImpl extends BasePresenter<${nameClassPrefix}View, ${classPrefix}EventBus> implements ${nameClassPrefix}Presenter {
+@Presenter( view = ${nameClassPrefix}View.class )
+public class ${nameClassPrefix}Presenter extends BasePresenter<${nameClassPrefix}View, ${classPrefix}EventBus> {
 
 }
diff --git a/src/main/resources/mvp/View.java.vm b/src/main/resources/mvp/View.java.vm
@@ -15,16 +15,27 @@
  *#
 package ${basePackage}.${name};
 
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.IsWidget;
-import com.mvp4g.client.presenter.PresenterInterface;
-import com.mvp4g.client.view.ReverseViewInterface;
+import com.google.gwt.user.client.ui.SimplePanel;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.Widget;
+import com.google.inject.Inject;
 
-import ${basePackage}.${classPrefix}EventBus;
+public class ${nameClassPrefix}View extends Composite {
 
-public interface ${nameClassPrefix}View extends IsWidget, ReverseViewInterface<${nameClassPrefix}View.${nameClassPrefix}Presenter> {
-
-	public interface ${nameClassPrefix}Presenter extends PresenterInterface<${nameClassPrefix}View, ${classPrefix}EventBus> {
-
-	}
+    private static RootViewUiBinder uiBinder = GWT.create( RootViewUiBinder.class );
 
-}
+    interface RootViewUiBinder extends UiBinder<Widget, ${nameClassPrefix}View> {
+    }
+
+   	@Inject
+    private ${nameClassPrefix}Presenter presenter;
+
+    public ${nameClassPrefix}View() {
+        initWidget(uiBinder.createAndBindUi(this));
+    }
+
+}
diff --git a/src/main/resources/mvp/ViewImpl.ui.xml.vm → src/main/resources/mvp/View.ui.xml.vm b/src/main/resources/mvp/ViewImpl.ui.xml.vm → src/main/resources/mvp/View.ui.xml.vm
diff --git a/src/main/resources/mvp/ViewImpl.java.vm b/src/main/resources/mvp/ViewImpl.java.vm