Changeset 743

Timestamp:

06/22/07 15:51:53 (2 years ago)

Author:

nozawa

Message:

The check on the default value is added.

Files:

• trunk/plugins/org.jalcedo.generator.client.beans/src/org/jalcedo/generator/client/beans/SourceGenerator.java (modified) (1 diff)
• trunk/plugins/org.jalcedo.generator.client.beans/src/org/jalcedo/generator/client/beans/internal/model/PropertyImpl.java (modified) (1 diff)
• trunk/plugins/org.jalcedo.generator.client.beans/src/org/jalcedo/generator/client/beans/model/Property.java (modified) (1 diff)
• trunk/plugins/org.jalcedo.generator.client.beans/templates/ApplyActionGenerator.jet (modified) (2 diffs)

trunk/plugins/org.jalcedo.generator.client.beans/src/org/jalcedo/generator/client/beans/SourceGenerator.java

@@ -154 +154 @@
-                detailComposite, monitor);
-    }
+    
+    public void generateComponentsFactory(BeanEditorInfo beanEditorInfo,
+    IProgressMonitor monitor) throws CoreException {
+        
+        BeanEvent event = new BeanEventImpl(beanEditorInfo);
+        BeanDataSource dataSource = new BeanDataSourceImpl(beanEditorInfo,
+                event);
+        
+        BeanAddAction addAction = new BeanAddActionImpl(beanEditorInfo);
+        BeanRemoveAction removeAction = new BeanRemoveActionImpl(
+                beanEditorInfo);
+        BeanFetchAction fetchAction = new BeanFetchActionImpl(beanEditorInfo,
+                event);
+        BeanApplyAction applyAction = new BeanApplyActionImpl(beanEditorInfo);
+        BeanDetailComposite detailComposite = new BeanDetailCompositeImpl(
+                beanEditorInfo);
+        BeanContentProvider contentProvider = new BeanContentProviderImpl(
+                beanEditorInfo, event);
+        BeanListComposite listComposite = new BeanListCompositeImpl(
+                beanEditorInfo);
+        
+        this
+        .generateBeanComponentsFactory(beanEditorInfo, addAction,
+                applyAction, fetchAction, removeAction, dataSource,
+                contentProvider, detailComposite, listComposite,
+                monitor);
+    }
-
-    /**

trunk/plugins/org.jalcedo.generator.client.beans/src/org/jalcedo/generator/client/beans/internal/model/PropertyImpl.java

@@ -374 +374 @@
-        return null;
-    }
+    public String getDefaultValue(){
+        if(isPrimitiveType(this.typeSignature)){
+            String readableSignature = Signature.toString(this.typeSignature);
+            if(readableSignature.equals("boolean")){
+                return "false";
+            }else if (readableSignature.equals("char")) {
+                return "'\u0000'";
+            }else if (readableSignature.equals("double")||readableSignature.equals("float")) {
+                return "0.0";
+            }else {
+                return "0";
+            }
+        }
+        return "null";
+    }
+    
-
-    /**

trunk/plugins/org.jalcedo.generator.client.beans/src/org/jalcedo/generator/client/beans/model/Property.java

@@ -51 +51 @@
-     */
-    String getParser();
+    
+    String getDefaultValue();
-}

trunk/plugins/org.jalcedo.generator.client.beans/templates/ApplyActionGenerator.jet

@@ -12 +12 @@
-    String idGetterName = targetBean.getIdField().getGetterName();
-    String idPropertyname = targetBean.getIdField().getTypeName();
+    String idDefaultValue = targetBean.getIdField().getDefaultValue();
-    
-%>
@@ -58 +59 @@
-            IStructuredSelection ss = (IStructuredSelection) selection;
-            <%=beanName%> <%=beanInstanceName%> = (<%=beanName%>) ss.getFirstElement();
-null
+<%=idDefaultValue%>
-                this.getDataSource().create(<%=beanInstanceName%>);
-            } else {