[antlrworks] Fix compilation with JGoodies Forms 1.6.0 (thanks to Mary Ellen Foster)
Mohamed ElMorabity
melmorabity at fedoraproject.org
Tue Jan 29 16:04:15 UTC 2013
commit 0a200f47ed949fd1a23183d07d9360f8d5420c17
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date: Tue Jan 29 17:03:49 2013 +0100
Fix compilation with JGoodies Forms 1.6.0 (thanks to Mary Ellen Foster)
antlrworks-1.4.3-jgoodies-forms_1.6.0.patch | 1274 +++++++++++++++++++++++++++
antlrworks.spec | 16 +-
2 files changed, 1285 insertions(+), 5 deletions(-)
---
diff --git a/antlrworks-1.4.3-jgoodies-forms_1.6.0.patch b/antlrworks-1.4.3-jgoodies-forms_1.6.0.patch
new file mode 100644
index 0000000..08b6b9e
--- /dev/null
+++ b/antlrworks-1.4.3-jgoodies-forms_1.6.0.patch
@@ -0,0 +1,1274 @@
+diff -up ./src/aw/org/antlr/works/debugger/remote/DBRemoteConnectDialog.java.orig ./src/aw/org/antlr/works/debugger/remote/DBRemoteConnectDialog.java
+--- ./src/aw/org/antlr/works/debugger/remote/DBRemoteConnectDialog.java.orig 2011-08-08 11:53:50.000000000 +0200
++++ ./src/aw/org/antlr/works/debugger/remote/DBRemoteConnectDialog.java 2013-01-29 16:57:07.388081450 +0100
+@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
+ package org.antlr.works.debugger.remote;
+
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.*;
+ import org.antlr.xjlib.appkit.frame.XJDialog;
+ import org.antlr.xjlib.foundation.XJSystem;
+@@ -105,16 +105,16 @@ public class DBRemoteConnectDialog exten
+ {
+ contentPane.setLayout(new FormLayout(
+ new ColumnSpec[] {
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(120))
+ },
+ new RowSpec[] {
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC
+ }));
+
+ //---- label1 ----
+@@ -142,10 +142,10 @@ public class DBRemoteConnectDialog exten
+ buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
+ buttonBar.setLayout(new FormLayout(
+ new ColumnSpec[] {
+- FormFactory.GLUE_COLSPEC,
+- FormFactory.BUTTON_COLSPEC,
+- FormFactory.RELATED_GAP_COLSPEC,
+- FormFactory.BUTTON_COLSPEC
++ FormSpecs.GLUE_COLSPEC,
++ FormSpecs.BUTTON_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
++ FormSpecs.BUTTON_COLSPEC
+ },
+ RowSpec.decodeSpecs("pref")));
+
+diff -up ./src/aw/org/antlr/works/dialog/AWPrefsDialog.java.orig ./src/aw/org/antlr/works/dialog/AWPrefsDialog.java
+--- ./src/aw/org/antlr/works/dialog/AWPrefsDialog.java.orig 2013-01-29 16:54:41.588288651 +0100
++++ ./src/aw/org/antlr/works/dialog/AWPrefsDialog.java 2013-01-29 16:57:07.624071442 +0100
+@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
+ package org.antlr.works.dialog;
+
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.*;
+ import org.antlr.works.IDE;
+ import org.antlr.works.debugger.local.DBLocal;
+@@ -585,35 +585,35 @@ public class AWPrefsDialog extends XJPan
+ tabGeneral.setLayout(new FormLayout(
+ new ColumnSpec[] {
+ new ColumnSpec(Sizes.dluX(10)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.RIGHT, Sizes.DEFAULT, FormSpec.NO_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ ColumnSpec.decode("max(min;20dlu)"),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ ColumnSpec.decode("max(min;40dlu)"),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(10))
+ },
+ new RowSpec[] {
+ new RowSpec(Sizes.dluY(10)),
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC
+ }));
+
+ //---- label2 ----
+@@ -680,42 +680,42 @@ public class AWPrefsDialog extends XJPan
+ tabEditor.setLayout(new FormLayout(
+ new ColumnSpec[] {
+ new ColumnSpec(Sizes.dluX(10)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.RIGHT, Sizes.DEFAULT, FormSpec.NO_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(20)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ ColumnSpec.decode("max(default;45dlu)"),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(20)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(30)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(10))
+ },
+ new RowSpec[] {
+ new RowSpec(Sizes.dluY(10)),
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(Sizes.dluY(10))
+ }));
+
+@@ -794,41 +794,41 @@ public class AWPrefsDialog extends XJPan
+ tabSyntax.setLayout(new FormLayout(
+ new ColumnSpec[] {
+ new ColumnSpec(Sizes.dluX(10)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.RIGHT, Sizes.DEFAULT, FormSpec.NO_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(20)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW)
+ },
+ new RowSpec[] {
+ new RowSpec(Sizes.dluY(10)),
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC
+ }));
+
+ //---- label26 ----
+@@ -1035,33 +1035,33 @@ public class AWPrefsDialog extends XJPan
+ tabCompiler.setLayout(new FormLayout(
+ new ColumnSpec[] {
+ new ColumnSpec(Sizes.dluX(10)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW),
+- FormFactory.DEFAULT_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
+ new ColumnSpec(Sizes.dluX(10))
+ },
+ new RowSpec[] {
+ new RowSpec(Sizes.dluY(10)),
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(Sizes.dluY(10)),
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC
+ }));
+
+ //---- jikesRadio ----
+@@ -1122,43 +1122,43 @@ public class AWPrefsDialog extends XJPan
+ tabDebugger.setLayout(new FormLayout(
+ new ColumnSpec[] {
+ new ColumnSpec(Sizes.dluX(10)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.RIGHT, Sizes.DEFAULT, FormSpec.NO_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(10)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.RIGHT, Sizes.DEFAULT, FormSpec.NO_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ ColumnSpec.decode("max(default;20dlu)"),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(10))
+ },
+ new RowSpec[] {
+ new RowSpec(Sizes.dluY(10)),
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(Sizes.dluY(10)),
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC
+ }));
+
+ //---- label33 ----
+@@ -1276,23 +1276,23 @@ public class AWPrefsDialog extends XJPan
+ panel1.setLayout(new FormLayout(
+ new ColumnSpec[] {
+ new ColumnSpec(Sizes.dluX(10)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC
+ },
+ new RowSpec[] {
+ new RowSpec(Sizes.dluY(10)),
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC
+ }));
+
+ //---- label8 ----
+@@ -1331,27 +1331,27 @@ public class AWPrefsDialog extends XJPan
+ tabUpdates.setLayout(new FormLayout(
+ new ColumnSpec[] {
+ new ColumnSpec(Sizes.dluX(10)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(10))
+ },
+ new RowSpec[] {
+ new RowSpec(Sizes.dluY(10)),
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(Sizes.dluY(10)),
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC
+ }));
+
+ //---- label7 ----
+@@ -1390,26 +1390,26 @@ public class AWPrefsDialog extends XJPan
+ tabTestRig.setLayout(new FormLayout(
+ new ColumnSpec[] {
+ new ColumnSpec(Sizes.dluX(10)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(10))
+ },
+ new RowSpec[] {
+ new RowSpec(Sizes.dluY(10)),
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.UNRELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.UNRELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(RowSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW),
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(Sizes.dluY(10))
+ }));
+
+@@ -1451,8 +1451,8 @@ public class AWPrefsDialog extends XJPan
+ buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
+ buttonBar.setLayout(new FormLayout(
+ new ColumnSpec[] {
+- FormFactory.GLUE_COLSPEC,
+- FormFactory.BUTTON_COLSPEC
++ FormSpecs.GLUE_COLSPEC,
++ FormSpecs.BUTTON_COLSPEC
+ },
+ RowSpec.decodeSpecs("pref")));
+
+diff -up ./src/aw/org/antlr/works/dialog/DebuggerInputDialog.java.orig ./src/aw/org/antlr/works/dialog/DebuggerInputDialog.java
+--- ./src/aw/org/antlr/works/dialog/DebuggerInputDialog.java.orig 2011-08-08 11:53:50.000000000 +0200
++++ ./src/aw/org/antlr/works/dialog/DebuggerInputDialog.java 2013-01-29 16:57:07.630071188 +0100
+@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
+ package org.antlr.works.dialog;
+
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.*;
+ import org.antlr.works.debugger.DebuggerTab;
+ import org.antlr.works.grammar.element.ElementRule;
+@@ -186,25 +186,25 @@ public class DebuggerInputDialog extends
+ contentPane.setLayout(new FormLayout(
+ new ColumnSpec[] {
+ new ColumnSpec(ColumnSpec.RIGHT, Sizes.DEFAULT, FormSpec.NO_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC
+ },
+ new RowSpec[] {
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(RowSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW),
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC
+ }));
+
+ //---- textInputRadio ----
+@@ -252,10 +252,10 @@ public class DebuggerInputDialog extends
+ buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
+ buttonBar.setLayout(new FormLayout(
+ new ColumnSpec[] {
+- FormFactory.GLUE_COLSPEC,
+- FormFactory.BUTTON_COLSPEC,
+- FormFactory.RELATED_GAP_COLSPEC,
+- FormFactory.BUTTON_COLSPEC
++ FormSpecs.GLUE_COLSPEC,
++ FormSpecs.BUTTON_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
++ FormSpecs.BUTTON_COLSPEC
+ },
+ RowSpec.decodeSpecs("pref")));
+
+diff -up ./src/aw/org/antlr/works/dialog/DialogAbout.java.orig ./src/aw/org/antlr/works/dialog/DialogAbout.java
+--- ./src/aw/org/antlr/works/dialog/DialogAbout.java.orig 2013-01-29 16:54:41.588288651 +0100
++++ ./src/aw/org/antlr/works/dialog/DialogAbout.java 2013-01-29 16:57:07.614071866 +0100
+@@ -31,7 +31,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
+
+ package org.antlr.works.dialog;
+
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.*;
+ import org.antlr.Tool;
+ import org.antlr.stringtemplate.StringTemplate;
+@@ -153,26 +153,26 @@ public class DialogAbout extends XJPanel
+ contentPane.setLayout(new FormLayout(
+ new ColumnSpec[] {
+ new ColumnSpec(Sizes.dluX(10)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(10))
+ },
+ new RowSpec[] {
+ new RowSpec(Sizes.dluY(10)),
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(RowSpec.BOTTOM, Sizes.DEFAULT, FormSpec.NO_GROW),
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ RowSpec.decode("top:max(default;15dlu)"),
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ RowSpec.decode("bottom:max(default;10dlu)"),
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ RowSpec.decode("top:max(default;10dlu)"),
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ RowSpec.decode("fill:max(default;60dlu):grow"),
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(Sizes.dluY(10))
+ }));
+
+@@ -218,16 +218,16 @@ public class DialogAbout extends XJPanel
+ panel2.setLayout(new FormLayout(
+ new ColumnSpec[] {
+ new ColumnSpec(Sizes.dluX(10)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(10))
+ },
+ new RowSpec[] {
+ new RowSpec(Sizes.dluY(10)),
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(RowSpec.FILL, Sizes.DEFAULT, FormSpec.NO_GROW),
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(Sizes.dluY(10))
+ }));
+
+@@ -245,16 +245,16 @@ public class DialogAbout extends XJPanel
+ panel1.setLayout(new FormLayout(
+ new ColumnSpec[] {
+ new ColumnSpec(Sizes.dluX(10)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(10))
+ },
+ new RowSpec[] {
+ new RowSpec(Sizes.dluY(10)),
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(RowSpec.FILL, Sizes.dluY(10), FormSpec.DEFAULT_GROW),
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(Sizes.dluY(10))
+ }));
+
+diff -up ./src/aw/org/antlr/works/dialog/DialogGenerate.java.orig ./src/aw/org/antlr/works/dialog/DialogGenerate.java
+--- ./src/aw/org/antlr/works/dialog/DialogGenerate.java.orig 2013-01-29 16:54:41.589288609 +0100
++++ ./src/aw/org/antlr/works/dialog/DialogGenerate.java 2013-01-29 16:57:07.597072587 +0100
+@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
+ package org.antlr.works.dialog;
+
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.CellConstraints;
+ import com.jgoodies.forms.layout.ColumnSpec;
+ import com.jgoodies.forms.layout.FormLayout;
+@@ -126,16 +126,16 @@ public class DialogGenerate extends XJDi
+ {
+ contentPane.setLayout(new FormLayout(
+ new ColumnSpec[] {
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ ColumnSpec.decode("max(min;200dlu):grow"),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC
+ },
+ new RowSpec[] {
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC
+ }));
+
+ //---- label1 ----
+@@ -159,10 +159,10 @@ public class DialogGenerate extends XJDi
+ buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
+ buttonBar.setLayout(new FormLayout(
+ new ColumnSpec[] {
+- FormFactory.GLUE_COLSPEC,
+- FormFactory.BUTTON_COLSPEC,
+- FormFactory.RELATED_GAP_COLSPEC,
+- FormFactory.BUTTON_COLSPEC
++ FormSpecs.GLUE_COLSPEC,
++ FormSpecs.BUTTON_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
++ FormSpecs.BUTTON_COLSPEC
+ },
+ RowSpec.decodeSpecs("pref")));
+
+diff -up ./src/aw/org/antlr/works/dialog/DialogPersonalInfo.java.orig ./src/aw/org/antlr/works/dialog/DialogPersonalInfo.java
+--- ./src/aw/org/antlr/works/dialog/DialogPersonalInfo.java.orig 2013-01-29 16:54:41.589288609 +0100
++++ ./src/aw/org/antlr/works/dialog/DialogPersonalInfo.java 2013-01-29 16:57:07.638070849 +0100
+@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
+ package org.antlr.works.dialog;
+
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.*;
+ import org.antlr.works.prefs.AWPrefs;
+ import org.antlr.works.stats.StatisticsReporter;
+@@ -158,53 +158,53 @@ public class DialogPersonalInfo extends
+ {
+ contentPane.setLayout(new FormLayout(
+ new ColumnSpec[] {
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(50)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ ColumnSpec.decode("max(min;100dlu):grow"),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ ColumnSpec.decode("max(default;30dlu)"),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC
+ },
+ new RowSpec[] {
+ new RowSpec(RowSpec.FILL, Sizes.DEFAULT, FormSpec.NO_GROW),
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(Sizes.DLUY5),
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(Sizes.DLUY5),
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(RowSpec.CENTER, Sizes.DEFAULT, FormSpec.DEFAULT_GROW)
+ }));
+
+@@ -320,10 +320,10 @@ public class DialogPersonalInfo extends
+ buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
+ buttonBar.setLayout(new FormLayout(
+ new ColumnSpec[] {
+- FormFactory.GLUE_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.BUTTON_COLSPEC
++ FormSpecs.GLUE_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.BUTTON_COLSPEC
+ },
+ RowSpec.decodeSpecs("pref")));
+
+diff -up ./src/aw/org/antlr/works/dialog/DialogReports.java.orig ./src/aw/org/antlr/works/dialog/DialogReports.java
+--- ./src/aw/org/antlr/works/dialog/DialogReports.java.orig 2013-01-29 16:54:41.590288568 +0100
++++ ./src/aw/org/antlr/works/dialog/DialogReports.java 2013-01-29 16:57:07.578073393 +0100
+@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
+ package org.antlr.works.dialog;
+
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.*;
+ import org.antlr.xjlib.appkit.frame.XJDialog;
+ import org.antlr.xjlib.appkit.utils.XJAlert;
+@@ -328,25 +328,25 @@ public class DialogReports extends XJDia
+ {
+ contentPane.setLayout(new FormLayout(
+ new ColumnSpec[] {
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ ColumnSpec.decode("max(min;30dlu)"),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.RELATED_GAP_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ ColumnSpec.decode("max(min;30dlu):grow"),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW)
+ },
+ new RowSpec[] {
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(RowSpec.CENTER, Sizes.DEFAULT, FormSpec.DEFAULT_GROW)
+ }));
+
+@@ -406,10 +406,10 @@ public class DialogReports extends XJDia
+ buttonBar.setLayout(new FormLayout(
+ new ColumnSpec[] {
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.BUTTON_COLSPEC,
+- FormFactory.RELATED_GAP_COLSPEC,
+- FormFactory.BUTTON_COLSPEC
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.BUTTON_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
++ FormSpecs.BUTTON_COLSPEC
+ },
+ RowSpec.decodeSpecs("pref")));
+
+diff -up ./src/aw/org/antlr/works/dialog/DialogTestTemplate.java.orig ./src/aw/org/antlr/works/dialog/DialogTestTemplate.java
+--- ./src/aw/org/antlr/works/dialog/DialogTestTemplate.java.orig 2011-08-08 11:53:50.000000000 +0200
++++ ./src/aw/org/antlr/works/dialog/DialogTestTemplate.java 2013-01-29 16:57:07.592072800 +0100
+@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
+ package org.antlr.works.dialog;
+
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.*;
+ import org.antlr.works.IDE;
+ import org.antlr.works.debugger.DebuggerTab;
+@@ -244,19 +244,19 @@ public class DialogTestTemplate extends
+ contentPanel.setLayout(new FormLayout(
+ new ColumnSpec[] {
+ new ColumnSpec(ColumnSpec.RIGHT, Sizes.DEFAULT, FormSpec.NO_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW)
+ },
+ new RowSpec[] {
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(RowSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW),
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC
+ }));
+
+ //---- textTestRadio ----
+@@ -301,10 +301,10 @@ public class DialogTestTemplate extends
+ buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
+ buttonBar.setLayout(new FormLayout(
+ new ColumnSpec[] {
+- FormFactory.GLUE_COLSPEC,
+- FormFactory.BUTTON_COLSPEC,
+- FormFactory.RELATED_GAP_COLSPEC,
+- FormFactory.BUTTON_COLSPEC
++ FormSpecs.GLUE_COLSPEC,
++ FormSpecs.BUTTON_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
++ FormSpecs.BUTTON_COLSPEC
+ },
+ RowSpec.decodeSpecs("pref")));
+
+diff -up ./src/aw/org/antlr/works/dialog/FindAndReplaceDialog.java.orig ./src/aw/org/antlr/works/dialog/FindAndReplaceDialog.java
+--- ./src/aw/org/antlr/works/dialog/FindAndReplaceDialog.java.orig 2011-08-08 11:53:50.000000000 +0200
++++ ./src/aw/org/antlr/works/dialog/FindAndReplaceDialog.java 2013-01-29 16:57:07.585073097 +0100
+@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
+
+ package org.antlr.works.dialog;
+
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.*;
+ import org.antlr.works.find.FindAndReplace;
+ import org.antlr.xjlib.appkit.frame.XJPanel;
+@@ -196,34 +196,34 @@ public class FindAndReplaceDialog extend
+ contentPane.setLayout(new FormLayout(
+ new ColumnSpec[] {
+ new ColumnSpec(Sizes.DLUX5),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.RIGHT, Sizes.DEFAULT, FormSpec.NO_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.DLUX5)
+ },
+ new RowSpec[] {
+ new RowSpec(Sizes.DLUY5),
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(RowSpec.CENTER, Sizes.DEFAULT, FormSpec.DEFAULT_GROW),
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(Sizes.DLUY5)
+ }));
+
+diff -up ./src/aw/org/antlr/works/dialog/NewWizardDialog.java.orig ./src/aw/org/antlr/works/dialog/NewWizardDialog.java
+--- ./src/aw/org/antlr/works/dialog/NewWizardDialog.java.orig 2011-08-08 11:53:50.000000000 +0200
++++ ./src/aw/org/antlr/works/dialog/NewWizardDialog.java 2013-01-29 16:57:07.604072290 +0100
+@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
+ package org.antlr.works.dialog;
+
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.*;
+ import org.antlr.stringtemplate.StringTemplate;
+ import org.antlr.stringtemplate.StringTemplateGroup;
+@@ -190,19 +190,19 @@ public class NewWizardDialog extends XJD
+ {
+ contentPanel.setLayout(new FormLayout(
+ new ColumnSpec[] {
+- FormFactory.RELATED_GAP_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.RIGHT, Sizes.DEFAULT, FormSpec.NO_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW)
+ },
+ new RowSpec[] {
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.UNRELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.UNRELATED_GAP_ROWSPEC,
+ new RowSpec(RowSpec.TOP, Sizes.DEFAULT, RowSpec.DEFAULT_GROW)
+ }
+ ));
+@@ -272,7 +272,7 @@ public class NewWizardDialog extends XJD
+ lexicalItemPanel.setLayout(new FormLayout(
+ new ColumnSpec[] {
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW)
+ },
+ new RowSpec[] {
+@@ -286,19 +286,19 @@ public class NewWizardDialog extends XJD
+ new ColumnSpec[] {
+ new ColumnSpec(ColumnSpec.DEFAULT, Sizes.dluX(10), FormSpec.NO_GROW),
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW)
+ },
+ new RowSpec[] {
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC
+ }
+ ));
+
+@@ -334,12 +334,12 @@ public class NewWizardDialog extends XJD
+ commentsPanel.setBorder(new TitledBorder(null, null, TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION));
+ commentsPanel.setLayout(new FormLayout(
+ new ColumnSpec[] {
+- FormFactory.DEFAULT_COLSPEC
++ FormSpecs.DEFAULT_COLSPEC
+ },
+ new RowSpec[] {
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC
+ }
+ ));
+
+@@ -387,21 +387,21 @@ public class NewWizardDialog extends XJD
+ new ColumnSpec[] {
+ new ColumnSpec(ColumnSpec.DEFAULT, Sizes.dluX(10), FormSpec.NO_GROW),
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW)
+ },
+ new RowSpec[] {
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC
+ }
+ ));
+
+@@ -425,12 +425,12 @@ public class NewWizardDialog extends XJD
+ stringPanel.setBorder(new EtchedBorder());
+ stringPanel.setLayout(new FormLayout(
+ new ColumnSpec[] {
+- FormFactory.DEFAULT_COLSPEC
++ FormSpecs.DEFAULT_COLSPEC
+ },
+ new RowSpec[] {
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC
+ }
+ ));
+
+@@ -460,14 +460,14 @@ public class NewWizardDialog extends XJD
+ wsPanel.setBorder(new EtchedBorder());
+ wsPanel.setLayout(new FormLayout(
+ new ColumnSpec[] {
+- FormFactory.DEFAULT_COLSPEC
++ FormSpecs.DEFAULT_COLSPEC
+ },
+ new RowSpec[] {
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC
+ }
+ ));
+
+@@ -502,10 +502,10 @@ public class NewWizardDialog extends XJD
+ buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
+ buttonBar.setLayout(new FormLayout(
+ new ColumnSpec[] {
+- FormFactory.GLUE_COLSPEC,
+- FormFactory.BUTTON_COLSPEC,
+- FormFactory.RELATED_GAP_COLSPEC,
+- FormFactory.BUTTON_COLSPEC
++ FormSpecs.GLUE_COLSPEC,
++ FormSpecs.BUTTON_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
++ FormSpecs.BUTTON_COLSPEC
+ },
+ RowSpec.decodeSpecs("pref")));
+
+diff -up ./src/aw/org/antlr/works/SplashScreen.java.orig ./src/aw/org/antlr/works/SplashScreen.java
+--- ./src/aw/org/antlr/works/SplashScreen.java.orig 2011-08-08 11:53:50.000000000 +0200
++++ ./src/aw/org/antlr/works/SplashScreen.java 2013-01-29 16:57:07.753065973 +0100
+@@ -31,7 +31,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
+
+ package org.antlr.works;
+
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.*;
+ import org.antlr.works.utils.IconManager;
+ import org.antlr.works.utils.Localizable;
+@@ -83,24 +83,24 @@ public class SplashScreen extends JWindo
+ contentPane.setLayout(new FormLayout(
+ new ColumnSpec[] {
+ new ColumnSpec(Sizes.dluX(0)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
+ new ColumnSpec(ColumnSpec.LEFT, Sizes.DLUX5, FormSpec.NO_GROW),
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(10))
+ },
+ new RowSpec[] {
+ new RowSpec(Sizes.dluY(10)),
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(RowSpec.TOP, Sizes.DEFAULT, FormSpec.NO_GROW),
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(RowSpec.TOP, Sizes.dluY(10), FormSpec.NO_GROW),
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(Sizes.dluY(10))
+ }));
+
diff --git a/antlrworks.spec b/antlrworks.spec
index 45bde2b..e1e74f2 100644
--- a/antlrworks.spec
+++ b/antlrworks.spec
@@ -1,12 +1,12 @@
Name: antlrworks
Version: 1.4.3
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Grammar development environment for ANTLR v3 grammars
Group: Development/Tools
License: BSD
-URL: http://www.antlr.org/works
-Source0: http://www.antlr.org/download/%{name}-%{version}-src.zip
+URL: http://www.antlr3.org/works
+Source0: http://www.antlr3.org/download/%{name}-%{version}-src.zip
Source1: antlrworks.desktop
# Disable embedding of dependency jars files into antlrworks jar file
Patch0: %{name}-1.4-build.patch
@@ -17,13 +17,15 @@ Patch1: %{name}-1.4-browsers.patch
Patch2: %{name}-1.4-jgoodies-forms_1.4.2.patch
# Fix compilation with OpenJDK 7
Patch3: %{name}-1.4.3-jdk7.patch
+# Fix compilation with JGoodies Forms >= 1.6.0
+Patch4: %{name}-1.4.3-jgoodies-forms_1.6.0.patch
BuildRequires: ant
BuildRequires: antlr-tool
BuildRequires: antlr3-tool >= 3.3
BuildRequires: desktop-file-utils
BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jgoodies-forms
+BuildRequires: jgoodies-forms >= 1.6.0
BuildRequires: stringtemplate
Requires: antlr-tool
Requires: antlr3-tool >= 3.3
@@ -32,7 +34,7 @@ Requires: graphviz
Requires: hicolor-icon-theme
# Antlrworks requires javac
Requires: java-devel >= 1:1.6.0
-Requires: jgoodies-forms
+Requires: jgoodies-forms >= 1.6.0
BuildArch: noarch
%description
@@ -55,6 +57,7 @@ encountered by grammar developers.
%patch1 -p1 -b .browsers
%patch2 -p0 -b .jgoodies-forms_1.4.2
%patch3 -p1 -b .jdk7
+%patch4 -p0 -b .jgoodies-forms_1.6.0
find -name '*.class' -o -name '*.jar' -exec rm '{}' \;
@@ -105,6 +108,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor/ &>/dev/null || :
%changelog
+* Tue Jan 29 2013 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.4.3-8
+- Fix compilation with JGoodies Forms 1.6.0 (thanks to Mary Ellen Foster)
+
* Mon Jan 28 2013 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.4.3-7
- Add missing Requires on antlr-tool (RHBZ #904572), until RHBZ #904979 is fixed
More information about the scm-commits
mailing list