[antlrworks] Update to 1.5.2
Mohamed ElMorabity
melmorabity at fedoraproject.org
Fri Jul 11 00:21:01 UTC 2014
commit a8c2ba52192cb38435bdc10f7df38af9fd53a690
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date: Fri Jul 11 02:21:11 2014 +0200
Update to 1.5.2
.gitignore | 1 +
antlrworks-1.4-browsers.patch | 12 -
antlrworks-1.4-jgoodies-forms_1.4.2.patch | 100 -------
antlrworks-1.4.3-jdk7.patch | 40 ---
antlrworks-1.4.3-jgoodies-forms_1.7.1.patch | 168 ------------
antlrworks-1.5.2-browsers.patch | 12 +
...1.4-build.patch => antlrworks-1.5.2-build.patch | 4 +-
... => antlrworks-1.5.2-jgoodies-forms_1.7.1.patch | 283 ++++++++++++++------
antlrworks.spec | 57 ++---
sources | 2 +-
10 files changed, 239 insertions(+), 440 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 869982b..9a910b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
antlrworks-1.4-src.zip
/antlrworks-1.4.3-src.zip
+/antlrworks-1.5.2.tar.gz
diff --git a/antlrworks-1.5.2-browsers.patch b/antlrworks-1.5.2-browsers.patch
new file mode 100644
index 0000000..18536e9
--- /dev/null
+++ b/antlrworks-1.5.2-browsers.patch
@@ -0,0 +1,12 @@
+diff -up ./src/org/antlr/xjlib/appkit/utils/BrowserLauncher.java.orig ./src/org/antlr/xjlib/appkit/utils/BrowserLauncher.java
+--- ./src/org/antlr/xjlib/appkit/utils/BrowserLauncher.java.orig 2013-10-09 01:50:02.000000000 +0200
++++ ./src/org/antlr/xjlib/appkit/utils/BrowserLauncher.java 2014-07-01 23:55:10.384195029 +0200
+@@ -464,7 +464,7 @@ public class BrowserLauncher {
+ case OTHER:
+ default:
+ // Jean Bovet: look for multiple browser in case netscape is not installed
+- browser = new String[] {"firefox", "mozilla", "netscape", "opera", "konqueror", "galeon", "firebird"};
++ browser = new String[] {"xdg-open", "firefox", "mozilla", "netscape", "opera", "konqueror", "galeon", "firebird"};
+ break;
+ }
+ return browser;
diff --git a/antlrworks-1.4-build.patch b/antlrworks-1.5.2-build.patch
similarity index 79%
rename from antlrworks-1.4-build.patch
rename to antlrworks-1.5.2-build.patch
index 7801e2b..78bc9fa 100644
--- a/antlrworks-1.4-build.patch
+++ b/antlrworks-1.5.2-build.patch
@@ -1,6 +1,6 @@
diff -up ./build.xml.orig ./build.xml
---- ./build.xml.orig 2010-05-09 21:50:20.000000000 +0200
-+++ ./build.xml 2010-05-14 16:36:46.210118611 +0200
+--- ./build.xml.orig 2013-10-09 01:50:02.000000000 +0200
++++ ./build.xml 2014-07-01 23:58:56.341915632 +0200
@@ -63,9 +63,6 @@
<fileset dir="${aw.resources}"/>
<fileset dir="${build.dir}" includes="**/*.class"/>
diff --git a/antlrworks-1.4.3-jgoodies-forms_1.6.0.patch b/antlrworks-1.5.2-jgoodies-forms_1.7.1.patch
similarity index 85%
rename from antlrworks-1.4.3-jgoodies-forms_1.6.0.patch
rename to antlrworks-1.5.2-jgoodies-forms_1.7.1.patch
index 08b6b9e..614ffef 100644
--- a/antlrworks-1.4.3-jgoodies-forms_1.6.0.patch
+++ b/antlrworks-1.5.2-jgoodies-forms_1.7.1.patch
@@ -1,6 +1,6 @@
-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
+diff -up ./src/org/antlr/works/debugger/remote/DBRemoteConnectDialog.java.orig ./src/org/antlr/works/debugger/remote/DBRemoteConnectDialog.java
+--- ./src/org/antlr/works/debugger/remote/DBRemoteConnectDialog.java.orig 2014-07-01 23:39:16.217687522 +0200
++++ ./src/org/antlr/works/debugger/remote/DBRemoteConnectDialog.java 2014-07-01 23:42:59.384499626 +0200
@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
package org.antlr.works.debugger.remote;
@@ -10,7 +10,15 @@ diff -up ./src/aw/org/antlr/works/debugger/remote/DBRemoteConnectDialog.java.ori
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
+@@ -98,23 +98,23 @@ public class DBRemoteConnectDialog exten
+
+ //======== dialogPane ========
+ {
+- dialogPane.setBorder(Borders.DIALOG_BORDER);
++ dialogPane.setBorder(Borders.DIALOG);
+ dialogPane.setLayout(new BorderLayout());
+
+ //======== contentPane ========
{
contentPane.setLayout(new FormLayout(
new ColumnSpec[] {
@@ -34,8 +42,12 @@ diff -up ./src/aw/org/antlr/works/debugger/remote/DBRemoteConnectDialog.java.ori
}));
//---- label1 ----
-@@ -142,10 +142,10 @@ public class DBRemoteConnectDialog exten
- buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
+@@ -139,13 +139,13 @@ public class DBRemoteConnectDialog exten
+
+ //======== buttonBar ========
+ {
+- buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
++ buttonBar.setBorder(Borders.BUTTON_BAR_PAD);
buttonBar.setLayout(new FormLayout(
new ColumnSpec[] {
- FormFactory.GLUE_COLSPEC,
@@ -49,9 +61,9 @@ diff -up ./src/aw/org/antlr/works/debugger/remote/DBRemoteConnectDialog.java.ori
},
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
+diff -up ./src/org/antlr/works/dialog/AWPrefsDialog.java.orig ./src/org/antlr/works/dialog/AWPrefsDialog.java
+--- ./src/org/antlr/works/dialog/AWPrefsDialog.java.orig 2014-07-01 23:39:16.185688408 +0200
++++ ./src/org/antlr/works/dialog/AWPrefsDialog.java 2014-07-01 23:49:49.268116465 +0200
@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
package org.antlr.works.dialog;
@@ -61,6 +73,15 @@ diff -up ./src/aw/org/antlr/works/dialog/AWPrefsDialog.java.orig ./src/aw/org/an
import com.jgoodies.forms.layout.*;
import org.antlr.works.IDE;
import org.antlr.works.debugger.local.DBLocal;
+@@ -567,7 +567,7 @@ public class AWPrefsDialog extends XJPan
+
+ //======== dialogPane ========
+ {
+- dialogPane.setBorder(Borders.DIALOG_BORDER);
++ dialogPane.setBorder(Borders.DIALOG);
+ dialogPane.setMinimumSize(new Dimension(540, 350));
+ dialogPane.setLayout(new BorderLayout());
+
@@ -585,35 +585,35 @@ public class AWPrefsDialog extends XJPan
tabGeneral.setLayout(new FormLayout(
new ColumnSpec[] {
@@ -69,16 +90,18 @@ diff -up ./src/aw/org/antlr/works/dialog/AWPrefsDialog.java.orig ./src/aw/org/an
+ 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)"),
+- new ColumnSpec("max(min;20dlu)"),
- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ ColumnSpec.decode("max(min;20dlu)"),
++ 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)"),
+- new ColumnSpec("max(min;40dlu)"),
- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ ColumnSpec.decode("max(min;40dlu)"),
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
new ColumnSpec(Sizes.dluX(10))
},
new RowSpec[] {
@@ -129,10 +152,11 @@ diff -up ./src/aw/org/antlr/works/dialog/AWPrefsDialog.java.orig ./src/aw/org/an
+ 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)"),
+- new ColumnSpec("max(default;45dlu)"),
- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ ColumnSpec.decode("max(default;45dlu)"),
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
new ColumnSpec(Sizes.dluX(20)),
- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
@@ -332,12 +356,13 @@ diff -up ./src/aw/org/antlr/works/dialog/AWPrefsDialog.java.orig ./src/aw/org/an
+ 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)"),
+- new ColumnSpec("max(default;20dlu)"),
- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
- FormFactory.DEFAULT_COLSPEC,
- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ ColumnSpec.decode("max(default;20dlu)"),
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ FormSpecs.DEFAULT_COLSPEC,
+ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
new ColumnSpec(Sizes.dluX(10))
@@ -508,8 +533,12 @@ diff -up ./src/aw/org/antlr/works/dialog/AWPrefsDialog.java.orig ./src/aw/org/an
new RowSpec(Sizes.dluY(10))
}));
-@@ -1451,8 +1451,8 @@ public class AWPrefsDialog extends XJPan
- buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
+@@ -1448,11 +1448,11 @@ public class AWPrefsDialog extends XJPan
+
+ //======== buttonBar ========
+ {
+- buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
++ buttonBar.setBorder(Borders.BUTTON_BAR_PAD);
buttonBar.setLayout(new FormLayout(
new ColumnSpec[] {
- FormFactory.GLUE_COLSPEC,
@@ -519,9 +548,9 @@ diff -up ./src/aw/org/antlr/works/dialog/AWPrefsDialog.java.orig ./src/aw/org/an
},
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
+diff -up ./src/org/antlr/works/dialog/DebuggerInputDialog.java.orig ./src/org/antlr/works/dialog/DebuggerInputDialog.java
+--- ./src/org/antlr/works/dialog/DebuggerInputDialog.java.orig 2014-07-01 23:39:16.207687799 +0200
++++ ./src/org/antlr/works/dialog/DebuggerInputDialog.java 2014-07-01 23:42:59.381499709 +0200
@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
package org.antlr.works.dialog;
@@ -531,6 +560,15 @@ diff -up ./src/aw/org/antlr/works/dialog/DebuggerInputDialog.java.orig ./src/aw/
import com.jgoodies.forms.layout.*;
import org.antlr.works.debugger.DebuggerTab;
import org.antlr.works.grammar.element.ElementRule;
+@@ -178,7 +178,7 @@ public class DebuggerInputDialog extends
+
+ //======== dialogPane ========
+ {
+- dialogPane.setBorder(Borders.DIALOG_BORDER);
++ dialogPane.setBorder(Borders.DIALOG);
+ dialogPane.setLayout(new BorderLayout());
+
+ //======== contentPane ========
@@ -186,25 +186,25 @@ public class DebuggerInputDialog extends
contentPane.setLayout(new FormLayout(
new ColumnSpec[] {
@@ -572,8 +610,12 @@ diff -up ./src/aw/org/antlr/works/dialog/DebuggerInputDialog.java.orig ./src/aw/
}));
//---- textInputRadio ----
-@@ -252,10 +252,10 @@ public class DebuggerInputDialog extends
- buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
+@@ -249,13 +249,13 @@ public class DebuggerInputDialog extends
+
+ //======== buttonBar ========
+ {
+- buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
++ buttonBar.setBorder(Borders.BUTTON_BAR_PAD);
buttonBar.setLayout(new FormLayout(
new ColumnSpec[] {
- FormFactory.GLUE_COLSPEC,
@@ -587,9 +629,9 @@ diff -up ./src/aw/org/antlr/works/dialog/DebuggerInputDialog.java.orig ./src/aw/
},
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
+diff -up ./src/org/antlr/works/dialog/DialogAbout.java.orig ./src/org/antlr/works/dialog/DialogAbout.java
+--- ./src/org/antlr/works/dialog/DialogAbout.java.orig 2014-07-01 23:39:16.211687688 +0200
++++ ./src/org/antlr/works/dialog/DialogAbout.java 2014-07-01 23:51:48.770796716 +0200
@@ -31,7 +31,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
package org.antlr.works.dialog;
@@ -599,7 +641,7 @@ diff -up ./src/aw/org/antlr/works/dialog/DialogAbout.java.orig ./src/aw/org/antl
import com.jgoodies.forms.layout.*;
import org.antlr.Tool;
import org.antlr.stringtemplate.StringTemplate;
-@@ -153,26 +153,26 @@ public class DialogAbout extends XJPanel
+@@ -155,26 +155,26 @@ public class DialogAbout extends XJPanel
contentPane.setLayout(new FormLayout(
new ColumnSpec[] {
new ColumnSpec(Sizes.dluX(10)),
@@ -620,23 +662,27 @@ diff -up ./src/aw/org/antlr/works/dialog/DialogAbout.java.orig ./src/aw/org/antl
+ 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)"),
+- new RowSpec("top:max(default;15dlu)"),
- FormFactory.LINE_GAP_ROWSPEC,
-+ FormSpecs.LINE_GAP_ROWSPEC,
- RowSpec.decode("bottom:max(default;10dlu)"),
+- new RowSpec("bottom:max(default;10dlu)"),
- FormFactory.LINE_GAP_ROWSPEC,
-+ FormSpecs.LINE_GAP_ROWSPEC,
- RowSpec.decode("top:max(default;10dlu)"),
+- new RowSpec("top:max(default;10dlu)"),
- FormFactory.LINE_GAP_ROWSPEC,
-+ FormSpecs.LINE_GAP_ROWSPEC,
- RowSpec.decode("fill:max(default;60dlu):grow"),
+- new RowSpec("fill:max(default;60dlu):grow"),
- FormFactory.LINE_GAP_ROWSPEC,
+ FormSpecs.LINE_GAP_ROWSPEC,
++ RowSpec.decode("top:max(default;15dlu)"),
++ FormSpecs.LINE_GAP_ROWSPEC,
++ RowSpec.decode("bottom:max(default;10dlu)"),
++ FormSpecs.LINE_GAP_ROWSPEC,
++ RowSpec.decode("top:max(default;10dlu)"),
++ FormSpecs.LINE_GAP_ROWSPEC,
++ RowSpec.decode("fill:max(default;60dlu):grow"),
++ FormSpecs.LINE_GAP_ROWSPEC,
new RowSpec(Sizes.dluY(10))
}));
-@@ -218,16 +218,16 @@ public class DialogAbout extends XJPanel
+@@ -220,16 +220,16 @@ public class DialogAbout extends XJPanel
panel2.setLayout(new FormLayout(
new ColumnSpec[] {
new ColumnSpec(Sizes.dluX(10)),
@@ -657,7 +703,7 @@ diff -up ./src/aw/org/antlr/works/dialog/DialogAbout.java.orig ./src/aw/org/antl
new RowSpec(Sizes.dluY(10))
}));
-@@ -245,16 +245,16 @@ public class DialogAbout extends XJPanel
+@@ -247,16 +247,16 @@ public class DialogAbout extends XJPanel
panel1.setLayout(new FormLayout(
new ColumnSpec[] {
new ColumnSpec(Sizes.dluX(10)),
@@ -678,9 +724,9 @@ diff -up ./src/aw/org/antlr/works/dialog/DialogAbout.java.orig ./src/aw/org/antl
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
+diff -up ./src/org/antlr/works/dialog/DialogGenerate.java.orig ./src/org/antlr/works/dialog/DialogGenerate.java
+--- ./src/org/antlr/works/dialog/DialogGenerate.java.orig 2014-07-01 23:39:16.193688187 +0200
++++ ./src/org/antlr/works/dialog/DialogGenerate.java 2014-07-01 23:52:05.167341204 +0200
@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
package org.antlr.works.dialog;
@@ -690,17 +736,26 @@ diff -up ./src/aw/org/antlr/works/dialog/DialogGenerate.java.orig ./src/aw/org/a
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
+@@ -119,23 +119,23 @@ public class DialogGenerate extends XJDi
+
+ //======== dialogPane ========
+ {
+- dialogPane.setBorder(Borders.DIALOG_BORDER);
++ dialogPane.setBorder(Borders.DIALOG);
+ dialogPane.setLayout(new BorderLayout());
+
+ //======== contentPane ========
{
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"),
+- new ColumnSpec("max(min;200dlu):grow"),
- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
- FormFactory.DEFAULT_COLSPEC
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ ColumnSpec.decode("max(min;200dlu):grow"),
+ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ FormSpecs.DEFAULT_COLSPEC
},
@@ -714,8 +769,12 @@ diff -up ./src/aw/org/antlr/works/dialog/DialogGenerate.java.orig ./src/aw/org/a
}));
//---- label1 ----
-@@ -159,10 +159,10 @@ public class DialogGenerate extends XJDi
- buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
+@@ -156,13 +156,13 @@ public class DialogGenerate extends XJDi
+
+ //======== buttonBar ========
+ {
+- buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
++ buttonBar.setBorder(Borders.BUTTON_BAR_PAD);
buttonBar.setLayout(new FormLayout(
new ColumnSpec[] {
- FormFactory.GLUE_COLSPEC,
@@ -729,9 +788,9 @@ diff -up ./src/aw/org/antlr/works/dialog/DialogGenerate.java.orig ./src/aw/org/a
},
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
+diff -up ./src/org/antlr/works/dialog/DialogPersonalInfo.java.orig ./src/org/antlr/works/dialog/DialogPersonalInfo.java
+--- ./src/org/antlr/works/dialog/DialogPersonalInfo.java.orig 2014-07-01 23:39:16.204687882 +0200
++++ ./src/org/antlr/works/dialog/DialogPersonalInfo.java 2014-07-01 23:52:12.279143610 +0200
@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
package org.antlr.works.dialog;
@@ -739,9 +798,18 @@ diff -up ./src/aw/org/antlr/works/dialog/DialogPersonalInfo.java.orig ./src/aw/o
-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.prefs.AWPrefs;
- import org.antlr.works.stats.StatisticsReporter;
-@@ -158,53 +158,53 @@ public class DialogPersonalInfo extends
+@@ -151,7 +151,7 @@ public class DialogPersonalInfo extends
+
+ //======== dialogPane ========
+ {
+- dialogPane.setBorder(Borders.DIALOG_BORDER);
++ dialogPane.setBorder(Borders.DIALOG);
+ dialogPane.setPreferredSize(new Dimension(750, 500));
+ dialogPane.setLayout(new BorderLayout());
+
+@@ -159,53 +159,53 @@ public class DialogPersonalInfo extends
{
contentPane.setLayout(new FormLayout(
new ColumnSpec[] {
@@ -751,14 +819,16 @@ diff -up ./src/aw/org/antlr/works/dialog/DialogPersonalInfo.java.orig ./src/aw/o
+ 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"),
+- new ColumnSpec("max(min;100dlu):grow"),
- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
-+ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
- ColumnSpec.decode("max(default;30dlu)"),
+- new ColumnSpec("max(default;30dlu)"),
- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
- FormFactory.DEFAULT_COLSPEC
+ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ ColumnSpec.decode("max(min;100dlu):grow"),
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ ColumnSpec.decode("max(default;30dlu)"),
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ FormSpecs.DEFAULT_COLSPEC
},
new RowSpec[] {
@@ -834,8 +904,12 @@ diff -up ./src/aw/org/antlr/works/dialog/DialogPersonalInfo.java.orig ./src/aw/o
new RowSpec(RowSpec.CENTER, Sizes.DEFAULT, FormSpec.DEFAULT_GROW)
}));
-@@ -320,10 +320,10 @@ public class DialogPersonalInfo extends
- buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
+@@ -318,13 +318,13 @@ public class DialogPersonalInfo extends
+
+ //======== buttonBar ========
+ {
+- buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
++ buttonBar.setBorder(Borders.BUTTON_BAR_PAD);
buttonBar.setLayout(new FormLayout(
new ColumnSpec[] {
- FormFactory.GLUE_COLSPEC,
@@ -849,9 +923,9 @@ diff -up ./src/aw/org/antlr/works/dialog/DialogPersonalInfo.java.orig ./src/aw/o
},
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
+diff -up ./src/org/antlr/works/dialog/DialogReports.java.orig ./src/org/antlr/works/dialog/DialogReports.java
+--- ./src/org/antlr/works/dialog/DialogReports.java.orig 2014-07-01 23:39:16.178688602 +0200
++++ ./src/org/antlr/works/dialog/DialogReports.java 2014-07-01 23:52:22.303865101 +0200
@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
package org.antlr.works.dialog;
@@ -861,23 +935,34 @@ diff -up ./src/aw/org/antlr/works/dialog/DialogReports.java.orig ./src/aw/org/an
import com.jgoodies.forms.layout.*;
import org.antlr.xjlib.appkit.frame.XJDialog;
import org.antlr.xjlib.appkit.utils.XJAlert;
+@@ -320,7 +320,7 @@ public class DialogReports extends XJDia
+
+ //======== dialogPane ========
+ {
+- dialogPane.setBorder(Borders.DIALOG_BORDER);
++ dialogPane.setBorder(Borders.DIALOG);
+ dialogPane.setPreferredSize(new Dimension(500, 500));
+ dialogPane.setLayout(new BorderLayout());
+
@@ -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)"),
+- new ColumnSpec("max(min;30dlu)"),
- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
- FormFactory.RELATED_GAP_COLSPEC,
- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- new ColumnSpec("max(min;30dlu):grow"),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ ColumnSpec.decode("max(min;30dlu)"),
+ 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,
++ ColumnSpec.decode("max(min;30dlu):grow"),
+ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW)
},
@@ -901,7 +986,12 @@ diff -up ./src/aw/org/antlr/works/dialog/DialogReports.java.orig ./src/aw/org/an
new RowSpec(RowSpec.CENTER, Sizes.DEFAULT, FormSpec.DEFAULT_GROW)
}));
-@@ -406,10 +406,10 @@ public class DialogReports extends XJDia
+@@ -402,14 +402,14 @@ public class DialogReports extends XJDia
+
+ //======== buttonBar ========
+ {
+- buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
++ buttonBar.setBorder(Borders.BUTTON_BAR_PAD);
buttonBar.setLayout(new FormLayout(
new ColumnSpec[] {
new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW),
@@ -916,9 +1006,9 @@ diff -up ./src/aw/org/antlr/works/dialog/DialogReports.java.orig ./src/aw/org/an
},
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
+diff -up ./src/org/antlr/works/dialog/DialogTestTemplate.java.orig ./src/org/antlr/works/dialog/DialogTestTemplate.java
+--- ./src/org/antlr/works/dialog/DialogTestTemplate.java.orig 2014-07-01 23:39:16.200687993 +0200
++++ ./src/org/antlr/works/dialog/DialogTestTemplate.java 2014-07-01 23:42:59.379499765 +0200
@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
package org.antlr.works.dialog;
@@ -928,6 +1018,15 @@ diff -up ./src/aw/org/antlr/works/dialog/DialogTestTemplate.java.orig ./src/aw/o
import com.jgoodies.forms.layout.*;
import org.antlr.works.IDE;
import org.antlr.works.debugger.DebuggerTab;
+@@ -235,7 +235,7 @@ public class DialogTestTemplate extends
+
+ //======== dialogPane ========
+ {
+- dialogPane.setBorder(Borders.DIALOG_BORDER);
++ dialogPane.setBorder(Borders.DIALOG);
+ dialogPane.setMinimumSize(new Dimension(340, 250));
+ dialogPane.setLayout(new BorderLayout());
+
@@ -244,19 +244,19 @@ public class DialogTestTemplate extends
contentPanel.setLayout(new FormLayout(
new ColumnSpec[] {
@@ -957,8 +1056,12 @@ diff -up ./src/aw/org/antlr/works/dialog/DialogTestTemplate.java.orig ./src/aw/o
}));
//---- textTestRadio ----
-@@ -301,10 +301,10 @@ public class DialogTestTemplate extends
- buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
+@@ -298,13 +298,13 @@ public class DialogTestTemplate extends
+
+ //======== buttonBar ========
+ {
+- buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
++ buttonBar.setBorder(Borders.BUTTON_BAR_PAD);
buttonBar.setLayout(new FormLayout(
new ColumnSpec[] {
- FormFactory.GLUE_COLSPEC,
@@ -972,9 +1075,9 @@ diff -up ./src/aw/org/antlr/works/dialog/DialogTestTemplate.java.orig ./src/aw/o
},
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
+diff -up ./src/org/antlr/works/dialog/FindAndReplaceDialog.java.orig ./src/org/antlr/works/dialog/FindAndReplaceDialog.java
+--- ./src/org/antlr/works/dialog/FindAndReplaceDialog.java.orig 2014-07-01 23:39:16.197688076 +0200
++++ ./src/org/antlr/works/dialog/FindAndReplaceDialog.java 2014-07-01 23:39:16.199688021 +0200
@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
package org.antlr.works.dialog;
@@ -1040,9 +1143,9 @@ diff -up ./src/aw/org/antlr/works/dialog/FindAndReplaceDialog.java.orig ./src/aw
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
+diff -up ./src/org/antlr/works/dialog/NewWizardDialog.java.orig ./src/org/antlr/works/dialog/NewWizardDialog.java
+--- ./src/org/antlr/works/dialog/NewWizardDialog.java.orig 2014-07-01 23:39:16.214687605 +0200
++++ ./src/org/antlr/works/dialog/NewWizardDialog.java 2014-07-01 23:42:59.383499654 +0200
@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
package org.antlr.works.dialog;
@@ -1052,7 +1155,15 @@ diff -up ./src/aw/org/antlr/works/dialog/NewWizardDialog.java.orig ./src/aw/org/
import com.jgoodies.forms.layout.*;
import org.antlr.stringtemplate.StringTemplate;
import org.antlr.stringtemplate.StringTemplateGroup;
-@@ -190,19 +190,19 @@ public class NewWizardDialog extends XJD
+@@ -183,26 +183,26 @@ public class NewWizardDialog extends XJD
+
+ //======== dialogPane ========
+ {
+- dialogPane.setBorder(Borders.DIALOG_BORDER);
++ dialogPane.setBorder(Borders.DIALOG);
+ dialogPane.setLayout(new BorderLayout());
+
+ //======== contentPanel ========
{
contentPanel.setLayout(new FormLayout(
new ColumnSpec[] {
@@ -1209,8 +1320,12 @@ diff -up ./src/aw/org/antlr/works/dialog/NewWizardDialog.java.orig ./src/aw/org/
}
));
-@@ -502,10 +502,10 @@ public class NewWizardDialog extends XJD
- buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
+@@ -499,13 +499,13 @@ public class NewWizardDialog extends XJD
+
+ //======== buttonBar ========
+ {
+- buttonBar.setBorder(Borders.BUTTON_BAR_GAP_BORDER);
++ buttonBar.setBorder(Borders.BUTTON_BAR_PAD);
buttonBar.setLayout(new FormLayout(
new ColumnSpec[] {
- FormFactory.GLUE_COLSPEC,
@@ -1224,9 +1339,9 @@ diff -up ./src/aw/org/antlr/works/dialog/NewWizardDialog.java.orig ./src/aw/org/
},
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
+diff -up ./src/org/antlr/works/SplashScreen.java.orig ./src/org/antlr/works/SplashScreen.java
+--- ./src/org/antlr/works/SplashScreen.java.orig 2014-07-01 23:39:16.220687439 +0200
++++ ./src/org/antlr/works/SplashScreen.java 2014-07-01 23:39:16.221687411 +0200
@@ -31,7 +31,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
package org.antlr.works;
diff --git a/antlrworks.spec b/antlrworks.spec
index c6a4081..9685302 100644
--- a/antlrworks.spec
+++ b/antlrworks.spec
@@ -1,42 +1,33 @@
Name: antlrworks
-Version: 1.4.3
-Release: 11%{?dist}
+Version: 1.5.2
+Release: 1%{?dist}
Summary: Grammar development environment for ANTLR v3 grammars
Group: Development/Tools
License: BSD
URL: http://www.antlr3.org/works
-Source0: http://www.antlr3.org/download/%{name}-%{version}-src.zip
+Source0: https://github.com/antlr/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
# Disable embedding of dependency jars files into antlrworks jar file
-Patch0: %{name}-1.4-build.patch
-# Add xdg-open and epiphany as available web browsers to open help (sent
-# upstream)
-Patch1: %{name}-1.4-browsers.patch
-# Fix compilation with JGoodies Forms >= 1.4.2
-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
+Patch0: %{name}-1.5.2-build.patch
# Fix compilation with JGoodies Forms >= 1.7.1
-Patch5: %{name}-1.4.3-jgoodies-forms_1.7.1.patch
+Patch1: %{name}-1.5.2-jgoodies-forms_1.7.1.patch
+# Add xdg-open to the list of available browsers to open the help
+Patch2: %{name}-1.5.2-browsers.patch
BuildRequires: ant
-BuildRequires: antlr-tool
-BuildRequires: antlr3-tool >= 3.3
+BuildRequires: antlr3-tool >= 3.5
BuildRequires: desktop-file-utils
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jgoodies-forms >= 1.7.1
-BuildRequires: stringtemplate
-Requires: antlr-tool
-Requires: antlr3-tool >= 3.3
+Requires: antlr3-tool >= 3.5
Requires: graphviz
# Owns /usr/share/icons/hicolor
Requires: hicolor-icon-theme
# Antlrworks requires javac
Requires: java-devel >= 1:1.6.0
Requires: jgoodies-forms >= 1.7.1
+Requires: stringtemplate4
BuildArch: noarch
%description
@@ -54,20 +45,17 @@ encountered by grammar developers.
%prep
-%setup -q -c
+%setup -q
%patch0 -p0 -b .build
-%patch1 -p1 -b .browsers
-%patch2 -p0 -b .jgoodies-forms_1.4.2
-%patch3 -p1 -b .jdk7
-%patch4 -p0 -b .jgoodies-forms_1.6.0
-%patch5 -p0 -b .jgoodies-forms_1.7.1
+%patch1 -p0 -b .jgoodies-forms_1.7.1
+%patch2 -p0 -b .browsers
-find -name '*.class' -o -name '*.jar' -exec rm '{}' \;
+# Fix version
+sed -i "s|^version=.*|version=%{version}|" build.properties
%build
-export CLASSPATH=$(build-classpath antlr antlr3 antlr3-runtime jgoodies-forms stringtemplate stringtemplate4)
-ant build
+ant build -Daw.lib=%{_javadir} -Dantlr3.jar=antlr3-runtime.jar -Djgoodies.jar=jgoodies-forms.jar
%install
@@ -103,7 +91,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor/ &>/dev/null || :
%files
-%defattr(-,root,root,-)
+%doc History.txt
%{_bindir}/%{name}
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/*.png
@@ -111,6 +99,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor/ &>/dev/null || :
%changelog
+* Fri Jul 11 2014 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.5.2-1
+- Update to 1.5.2
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
@@ -156,18 +147,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor/ &>/dev/null || :
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-* Sat Jun 12 2010 ELMORABITY Mohamed <melmorabity at fedoraproject.org> 1.4-4
+* Sat Jun 12 2010 Mohamed El Morabity <melmorabity at fedoraproject.org> 1.4-4
- Bump release
-* Fri Jun 4 2010 ELMORABITY Mohamed <melmorabity at fedoraproject.org> 1.4-3
+* Fri Jun 4 2010 Mohamed El Morabity <melmorabity at fedoraproject.org> 1.4-3
- Remove manual installation of antlrworks.desktop (managed by
desktop-file-install)
-* Thu Jun 3 2010 ELMORABITY Mohamed <melmorabity at fedoraproject.org> 1.4-2
+* Thu Jun 3 2010 Mohamed El Morabity <melmorabity at fedoraproject.org> 1.4-2
- Remove release.txt and readme.txt from sources
- Add hicolor-icon-theme as a Requires since it owns
%%{_datadir}/icons/hicolor
- Add call to desktop-file-install
-* Fri May 14 2010 ELMORABITY Mohamed <melmorabity at fedoraproject.org> 1.4-1
+* Fri May 14 2010 Mohamed El Morabity <melmorabity at fedoraproject.org> 1.4-1
- Initial RPM release
diff --git a/sources b/sources
index 34f42da..b207574 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4b700eae67f39d6bbe66d9138b187917 antlrworks-1.4.3-src.zip
+c70899b2799d7bcfaa26c639a0e51111 antlrworks-1.5.2.tar.gz
More information about the scm-commits
mailing list