Author: kmorin
Date: 2009-08-26 10:27:46 +0200 (Wed, 26 Aug 2009)
New Revision: 1582
Modified:
trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingGenerator.java
trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingMainClassGenerator.java
trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/tags/swing/CellHandler.java
trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/tags/swing/RowHandler.java
trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/tags/swing/TableHandler.java
Log:
Improved the binding a little bit.
Modified: trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingGenerator.java
===================================================================
--- trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingGenerator.java 2009-08-26 08:26:37 UTC (rev 1581)
+++ trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingGenerator.java 2009-08-26 08:27:46 UTC (rev 1582)
@@ -453,9 +453,6 @@
}
}
catch(NullPointerException eee) {
- log.error(i);
- eee.printStackTrace();
- return null;
}
}
}
Modified: trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingMainClassGenerator.java
===================================================================
--- trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingMainClassGenerator.java 2009-08-26 08:26:37 UTC (rev 1581)
+++ trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingMainClassGenerator.java 2009-08-26 08:27:46 UTC (rev 1582)
@@ -60,15 +60,17 @@
* @param out the file to record the content
*/
public void generate(File out) {
- String gmoClassName = gmo.getClassDescriptor().getName();
+ String gmoClass = gmo.getClassDescriptor().toString();
clazz.addImport("java.io.File");
- clazz.addImport("org.springframework.beans.factory.ListableBeanFactory");
- clazz.addImport("org.springframework.beans.factory.xml.XmlBeanFactory");
- clazz.addImport("org.springframework.core.io.FileSystemResource");
+// clazz.addImport("org.springframework.beans.factory.ListableBeanFactory");
+// clazz.addImport("org.springframework.beans.factory.xml.XmlBeanFactory");
+// clazz.addImport("org.springframework.core.io.FileSystemResource");
StringBuffer mainMethod = new StringBuffer();
- mainMethod.append("javax.swing.SwingUtilities.invokeLater(").append("new Runnable() {").append("public void run() {").append(gmoClassName).append("Impl main = new ").append(gmoClassName).append("Impl();\n").append("main.pack();\n").append("main.setVisible(true);}});");
+ mainMethod.append("javax.swing.SwingUtilities.invokeLater(").append("new Runnable() {\n").append("public void run() {\n")
+ .append(gmoClass).append("Impl main = new ").append(gmoClass).append("Impl();\n")
+ .append("main.setVisible(true);\n}\n});");
clazz.addMethod(new JavaMethod(
Modifier.PUBLIC | Modifier.STATIC,
Modified: trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/tags/swing/CellHandler.java
===================================================================
--- trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/tags/swing/CellHandler.java 2009-08-26 08:26:37 UTC (rev 1581)
+++ trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/tags/swing/CellHandler.java 2009-08-26 08:27:46 UTC (rev 1582)
@@ -76,10 +76,10 @@
else if (attr.getName().equals("ipady")) {
ipady = Integer.valueOf(attr.getValue());
}
- else if (attr.getName().equals("halign")) {
+ else if (attr.getName().equals("horizontalAlignment")) {
horizontalAlignment = getHalign(attr.getValue());
}
- else if (attr.getName().equals("valign")) {
+ else if (attr.getName().equals("verticalAlignment")) {
verticalAlignment = getValign(attr.getValue());
}
else if (attr.getName().equals("fill")) {
Modified: trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/tags/swing/RowHandler.java
===================================================================
--- trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/tags/swing/RowHandler.java 2009-08-26 08:26:37 UTC (rev 1581)
+++ trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/tags/swing/RowHandler.java 2009-08-26 08:27:46 UTC (rev 1582)
@@ -60,10 +60,10 @@
else if (attr.getName().equals("ipady")) {
ipady = Integer.valueOf(attr.getValue());
}
- else if (attr.getName().equals("halign")) {
+ else if (attr.getName().equals("horizontalAlignment")) {
horizontalAlignment = getHalign(attr.getValue());
}
- else if (attr.getName().equals("valign")) {
+ else if (attr.getName().equals("verticalAlignment")) {
verticalAlignment = getValign(attr.getValue());
}
else if (attr.getName().equals("fill")) {
Modified: trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/tags/swing/TableHandler.java
===================================================================
--- trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/tags/swing/TableHandler.java 2009-08-26 08:26:37 UTC (rev 1581)
+++ trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/tags/swing/TableHandler.java 2009-08-26 08:27:46 UTC (rev 1582)
@@ -47,7 +47,7 @@
public static final String DEFAULT_INSETS = "3, 3, 3, 3";
public static final HorizontalAlignment DEFAULT_HORIZONTAL_ALIGNMENT = HorizontalAlignment.ALIGN_DEFAULT;
public static final VerticalAlignment DEFAULT_VERTICAL_ALIGNMENT = VerticalAlignment.ALIGN_TOP;
- public static final String DEFAULT_FILL = "java.awt.GridBagConstraints.BOTH";
+ public static final String DEFAULT_FILL = "both";
public static final Integer DEFAULT_IPADX = 1;
public static final Integer DEFAULT_IPADY = 1;
public static final Double DEFAULT_WEIGHTX = 0.0;
@@ -75,40 +75,40 @@
public TableHandler(GuixModelObject table) {
for (AttributeDescriptor attr : table.getAttributeDescriptors()) {
- if (attr.getName().equals("weightx")) {
+ if (attr.getName().equalsIgnoreCase("weightx")) {
weightx = Double.valueOf(attr.getValue());
}
- else if (attr.getName().equals("weighty")) {
+ else if (attr.getName().equalsIgnoreCase("weighty")) {
weighty = Double.valueOf(attr.getValue());
}
- else if (attr.getName().equals("ipadx")) {
+ else if (attr.getName().equalsIgnoreCase("ipadx")) {
ipadx = Integer.valueOf(attr.getValue());
}
- else if (attr.getName().equals("ipady")) {
+ else if (attr.getName().equalsIgnoreCase("ipady")) {
ipady = Integer.valueOf(attr.getValue());
}
- else if (attr.getName().equals("halign")) {
+ else if (attr.getName().equalsIgnoreCase("horizontalAlignment")) {
horizontalAlignment = getHalign(attr.getValue());
if (horizontalAlignment == null) {
if (log.isErrorEnabled()) {
- log.error(table.getId() + "'s halign attribute has a wrong value : " + attr.getValue());
+ log.error(table.getId() + "'s horizontalAlignment attribute has a wrong value : " + attr.getValue());
}
- horizontalAlignment = HorizontalAlignment.ALIGN_DEFAULT;
+ horizontalAlignment = DEFAULT_HORIZONTAL_ALIGNMENT;
}
}
- else if (attr.getName().equals("valign")) {
+ else if (attr.getName().equalsIgnoreCase("verticalAlignment")) {
verticalAlignment = getValign(attr.getValue());
if (verticalAlignment == null) {
if (log.isErrorEnabled()) {
- log.error(table.getId() + "'s halign attribute has a wrong value : " + attr.getValue());
+ log.error(table.getId() + "'s verticalAlignment attribute has a wrong value : " + attr.getValue());
}
- verticalAlignment = VerticalAlignment.ALIGN_TOP;
+ verticalAlignment = DEFAULT_VERTICAL_ALIGNMENT;
}
}
- else if (attr.getName().equals("fill")) {
- fill = attr.getValue();
+ else if (attr.getName().equalsIgnoreCase("fill")) {
+ fill = attr.getValue();
}
- else if (attr.getName().equals("insets")) {
+ else if (attr.getName().equalsIgnoreCase("insets")) {
insets = attr.getValue();
}
}
@@ -313,7 +313,7 @@
.append(cl.getWeightx()).append(",")
.append(cl.getWeighty()).append(",")
.append(anchor != null ? anchor : DEFAULT_ANCHOR).append(",")
- .append(cl.getFill()).append(", new java.awt.Insets(")
+ .append("GridBagConstraints.").append(cl.getFill().toUpperCase()).append(", new java.awt.Insets(")
.append(cl.getInsets()).append("),")
.append(cl.getIpadx()).append(",")
.append(cl.getIpady()).append("));\n");
