[SCM] JAS(2) Plotter branch, build, updated. upstream/2.2.6-25-g97962b9
Gabriele Giacone
gg0-guest at alioth.debian.org
Sun Jan 17 16:49:27 UTC 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "JAS(2) Plotter".
The branch, build has been updated
via 97962b9ac6e023c7fe7e84362d5fa004a86a3a38 (commit)
via 13f164da8ba5d6a6f95c4edaaf6b2164c94f069d (commit)
via dcc4380b2afd60264ed5020b79508e3a85739fa2 (commit)
via d20f8cf81e7e0dc9c40ce986a3f54dd449f4d8ad (commit)
from e1af1f14ea69ffdf903e01be94ebfd95e90053d0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 97962b9ac6e023c7fe7e84362d5fa004a86a3a38
Merge: dcc4380b2afd60264ed5020b79508e3a85739fa2 13f164da8ba5d6a6f95c4edaaf6b2164c94f069d
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Sun Jan 17 17:48:55 2010 +0100
Merge branch 'master' into build
commit dcc4380b2afd60264ed5020b79508e3a85739fa2
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Sun Jan 17 17:45:39 2010 +0100
Updated patches
commit d20f8cf81e7e0dc9c40ce986a3f54dd449f4d8ad
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Sun Jan 17 14:54:47 2010 +0100
Updated patches
-----------------------------------------------------------------------
Summary of changes:
debian/control | 2 +-
debian/patches/patch/pom.xml.diff | 25 +++-
debian/patches/patch/tablelayout.diff | 294 ++-------------------------------
3 files changed, 32 insertions(+), 289 deletions(-)
diff --git a/debian/control b/debian/control
index 0c499b1..6859e27 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>,
Gabriele Giacone <1o5g4r8o at gmail.com>
Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper, quilt
Build-Depends-Indep: libsurefire-java (>= 2.4.3), javahelp2 (>= 2.0.05.ds1-3), junit,
- libxerces2-java
+ libxerces2-java, libtablelayout-java (>= 20090826)
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-java/freehep/jas-plotter.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/freehep/jas-plotter.git;a=summary
diff --git a/debian/patches/patch/pom.xml.diff b/debian/patches/patch/pom.xml.diff
index ab2929b..e8835c4 100644
--- a/debian/patches/patch/pom.xml.diff
+++ b/debian/patches/patch/pom.xml.diff
@@ -1,17 +1,17 @@
From: Gabriele Giacone <1o5g4r8o at gmail.com>
Subject: [PATCH] patch/pom.xml
-Removed dependency on freehep-export.
-freehep-export already is dependent on jas-plotter.
+ - Removed dependence on freehep-export (cyclic dependency)
+ - Added dependence on Debian libtablelayout
Signed-off-by: Gabriele Giacone <1o5g4r8o at gmail.com>
---
- pom.xml | 6 ------
- 1 files changed, 0 insertions(+), 6 deletions(-)
+ pom.xml | 14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
-index ed34af3..258722a 100644
+index ed34af3..ade5308 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,12 +29,6 @@
@@ -27,5 +27,20 @@ index ed34af3..258722a 100644
<groupId>javax.help</groupId>
<artifactId>javahelp</artifactId>
<version>2.0.02</version>
+@@ -48,7 +42,13 @@
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+- </dependency>
++ </dependency>
++ <dependency>
++ <groupId>org.debian</groupId>
++ <artifactId>tablelayout</artifactId>
++ <scope>system</scope>
++ <systemPath>/usr/share/java/tablelayout.jar</systemPath>
++ </dependency>
+ </dependencies>
+
+ <scm>
--
tg: (ac58baf..) patch/pom.xml (depends on: master)
diff --git a/debian/patches/patch/tablelayout.diff b/debian/patches/patch/tablelayout.diff
index f74ed89..1bef9a8 100644
--- a/debian/patches/patch/tablelayout.diff
+++ b/debian/patches/patch/tablelayout.diff
@@ -1,299 +1,27 @@
-From: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+From: Gabriele Giacone <1o5g4r8o at gmail.com>
Subject: [PATCH] patch/tablelayout
-This patch removes any dependency of JAS Plotter on TableLayout, which
-is non DFSG compliant. GridBagLayout is used instead of TableLayout.
+To compile against Debian libtablelayout
+under /usr/share/java/tablelayout.jar
-Signed-off-by: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+Signed-off-by: Gabriele Giacone <1o5g4r8o at gmail.com>
---
- src/main/java/jas/hist/JASHistPropertyDialog.java | 150 ++++++++++++++-------
- 1 files changed, 102 insertions(+), 48 deletions(-)
+ src/main/java/jas/hist/JASHistPropertyDialog.java | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/jas/hist/JASHistPropertyDialog.java b/src/main/java/jas/hist/JASHistPropertyDialog.java
-index 2d05d8a..aa14f7d 100644
+index 2d05d8a..9a9f250 100644
--- a/src/main/java/jas/hist/JASHistPropertyDialog.java
+++ b/src/main/java/jas/hist/JASHistPropertyDialog.java
-@@ -18,10 +18,14 @@ import java.awt.Dimension;
- import java.awt.FlowLayout;
- import java.awt.Frame;
- import java.awt.Graphics;
-+import java.awt.GridBagConstraints;
-+import java.awt.GridBagLayout;
- import java.awt.Insets;
- import java.awt.LayoutManager;
- import java.awt.event.ActionEvent;
- import java.awt.event.ActionListener;
-+import java.awt.event.WindowAdapter;
-+import java.awt.event.WindowEvent;
- import java.util.Date;
- import java.util.Enumeration;
- import javax.swing.BorderFactory;
-@@ -32,6 +36,8 @@ import javax.swing.DefaultListModel;
- import javax.swing.JButton;
- import javax.swing.JCheckBox;
- import javax.swing.JComboBox;
-+import javax.swing.JComponent;
-+import javax.swing.JFrame;
- import javax.swing.JLabel;
- import javax.swing.JList;
- import javax.swing.JPanel;
-@@ -46,11 +52,32 @@ import javax.swing.event.ChangeEvent;
+@@ -46,7 +46,7 @@ import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import tablelayout.TableLayout;
--
++import org.debian.tablelayout.TableLayout;
- public final class JASHistPropertyDialog extends PropertyDialog
- {
-+ /*
-+ * The commented code is used by Debian maintainers to ease
-+ * the switch from TableLayout (non DFSG compliant) to
-+ * GridBagLayout.
-+ */
-+ /*public static void main(String[] args) {
-+ tryFrame(new JASHist2DPropStyle().create2DPanel(), "Mine");
-+ tryFrame(new JASHist2DPropStyle().origCreate2DPanel(), "Original");
-+ //dialog.show();
-+ }
-+ public static JFrame tryFrame(JPanel p, String title) {
-+ JFrame frame = new JFrame();
-+ frame.setSize(700, 300);
-+ frame.setTitle(title);
-+ frame.add(p);
-+ frame.addWindowListener(new WindowAdapter() {
-+ public void windowClosing(WindowEvent e) {
-+ System.exit(0);
-+ }
-+ });
-+ frame.setVisible(true);
-+ return frame;
-+ }*/
- public JASHistPropertyDialog(Frame f,JASHist bean)
- {
- this(f, bean, DEFAULT);
-@@ -241,6 +268,28 @@ final class JASHistPropXAxis extends PropertyPage implements PropertySite
- }
- private JASHistPropAxis m_propAxis;
- }
-+
-+class GridBagPanel {
-+ private static final long serialVersionUID = 326390698286127169L;
-+ private GridBagLayout layout;
-+ private JPanel panel;
-+
-+ GridBagPanel(JPanel panel) {
-+ this.layout = new GridBagLayout();
-+ this.panel = panel;
-+ this.panel.setLayout(this.layout);
-+ }
-+
-+ public void add(JComponent comp, GridBagConstraints constraints) {
-+ this.layout.addLayoutComponent(comp, constraints);
-+ this.panel.add(comp);
-+ }
-+
-+ public JPanel getPanel() {
-+ return this.panel;
-+ }
-+}
-+
- final class JASHistPropAxis extends PropertyPage implements ActionListener
- {
- public JASHistPropAxis()
-@@ -260,15 +309,17 @@ final class JASHistPropAxis extends PropertyPage implements ActionListener
-
- addBinding(new PropertyBinding(label,"Label"));
- addBinding(new PropertyBinding(m_log,"logarithmic"));
--
-- JPanel p = new FixedHeightPanel(new TableLayout());
-- p.add("0 0 rw", new JLabel("Label:"));
-- p.add("0 1 rw", new JLabel("Type:"));
-- p.add("1 0 2",label);
-- p.add("1 1",m_type);
-- p.add("2 1",m_log);
-+
-+ JPanel p = new FixedHeightPanel();
-+ GridBagPanel panel = new GridBagPanel(p);
-+ panel.add(new JLabel("Label:"), new GridBagConstraints(0, 0, 1, 1, 0, 100, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(new JLabel("Type:"), new GridBagConstraints(0, 1, 1, 1, 0, 100, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(label, new GridBagConstraints(1, 0, 2, 1, 100, 100, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(m_type, new GridBagConstraints(1, 1, 1, 1, 100, 100, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(m_log, new GridBagConstraints(2, 1, 1, 1, 100, 100, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
- return p;
- }
-+
- private JPanel createRangePanel()
- {
- min = new JASTextField(15);
-@@ -286,20 +337,22 @@ final class JASHistPropAxis extends PropertyPage implements ActionListener
- t1.addActionListener(this);
- t2.addActionListener(this);
-
-- JPanel p = new FixedHeightPanel(new TableLayout());
-+ JPanel p = new FixedHeightPanel();
-+ GridBagPanel panel = new GridBagPanel(p);
- p.setBorder(new TitledBorder("Range"));
-- p.add("0 0 rw",new JLabel("Min:"));
-- p.add("0 1 rw",new JLabel("Max:"));
-- p.add("1 0 h",min);
-- p.add("1 1 h",max);
-- p.add("2 0 w",t1);
-- p.add("2 1 w",t2);
-- p.add("3 0 lW",auto);
-- p.add("3 1 lW",m_zero);
-+ panel.add(new JLabel("Min:"), new GridBagConstraints(0, 0, 1, 1, 0, 100, GridBagConstraints.EAST, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(new JLabel("Max:"), new GridBagConstraints(0, 1, 1, 1, 0, 100, GridBagConstraints.EAST, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(min, new GridBagConstraints(1, 0, 1, 1, 100, 100, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(max, new GridBagConstraints(1, 1, 1, 1, 100, 100, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(t1, new GridBagConstraints(2, 0, 1, 1, 0, 100, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(t2, new GridBagConstraints(2, 1, 1, 1, 0, 100, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(auto, new GridBagConstraints(3, 0, 1, 1, 0, 100, GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(m_zero, new GridBagConstraints(3, 1, 1, 1, 0, 100, GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-
- m_rangePanel = p;
- return p;
- }
-+
- private JPanel createBinsPanel()
- {
- m_bins = new JASTextField(10);
-@@ -584,7 +637,7 @@ final class JASHistPropStyle extends PropertyPage
- {
- JASHistPropStyle()
- {
-- setLayout(new TableLayout());
-+ GridBagPanel panel = new GridBagPanel(this);
- setBorder(BorderFactory.createTitledBorder("1D Plot Style"));
-
-
-@@ -607,9 +660,9 @@ final class JASHistPropStyle extends PropertyPage
- p.add(histStyle);
- p.add(histWidth);
-
-- add("0 0 w",hist);
-- add("1 0 Hw",histOutlineColor);
-- add("2 0 lW",p);
-+ panel.add(hist, new GridBagConstraints(0, 0, 1, 1, 100, 100, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(histOutlineColor, new GridBagConstraints(1, 0, 1, 1, 100, 100, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(p, new GridBagConstraints(2, 0, 1, 1, 100, 100, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-
- final JCheckBox error = new JCheckBox("Error Bars");
- final ColorChooser errorColor = new ColorChooser();
-@@ -624,9 +677,9 @@ final class JASHistPropStyle extends PropertyPage
- p.add(errorStyle);
- p.add(errorWidth);
-
-- add("0 1 w",error);
-- add("1 1 Hw",errorColor);
-- add("2 1 lW",p);
-+ panel.add(error, new GridBagConstraints(0, 1, 1, 1, 100, 100, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(errorColor, new GridBagConstraints(1, 1, 1, 1, 100, 100, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(p, new GridBagConstraints(2, 1, 1, 1, 100, 100, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-
- final JCheckBox points = new JCheckBox("Data Points");
- final ColorChooser pointColor = new ColorChooser();
-@@ -638,10 +691,10 @@ final class JASHistPropStyle extends PropertyPage
- p.add(pointStyle);
- p.add(pointSize);
-
-- add("0 2 w",points);
-- add("1 2 Hw",pointColor);
-- add("2 2 lW",p);
--
-+ panel.add(points, new GridBagConstraints(0, 2, 1, 1, 100, 100, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(pointColor, new GridBagConstraints(1, 2, 1, 1, 100, 100, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(p, new GridBagConstraints(2, 2, 1, 1, 100, 100, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-+
- final JCheckBox lines = new JCheckBox("Lines Between Points");
- final ColorChooser lineColor = new ColorChooser();
- final JComboBox lineStyle = new JComboBox();
-@@ -655,10 +708,10 @@ final class JASHistPropStyle extends PropertyPage
- p.add(lineStyle);
- p.add(lineWidth);
-
-- add("0 3 w",lines);
-- add("1 3 Hw",lineColor);
-- add("2 3 lW",p);
--
-+ panel.add(lines, new GridBagConstraints(0, 3, 1, 1, 100, 100, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(lineColor, new GridBagConstraints(1, 3, 1, 1, 100, 100, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(p, new GridBagConstraints(2, 3, 1, 1, 100, 100, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-+
- addBinding(new PropertyBinding(pointColor,"DataPointColor"));
- addBinding(new PropertyBinding(pointStyle,"DataPointStyle"));
- addBinding(new PropertyBinding(pointSize,"DataPointSize"));
-@@ -698,6 +751,7 @@ final class JASHistPropStyle extends PropertyPage
- }
- }// 1D JASHistPropStyle
-+
- final class JASHistScatterPropStyle extends PropertyPage
- {
- JASHistScatterPropStyle()
-@@ -852,7 +906,7 @@ final class JASHist2DPropStyle extends PropertyPage
- private CheckBoxBorderPanel create2DPanel()
- {
- CheckBoxBorderPanel p = new CheckBoxBorderPanel("2D Plot Style");
-- p.setLayout(new TableLayout());
-+ GridBagPanel panel = new GridBagPanel(p);
-
- //////////Plot Scheme//////////
- plotSchemePanel = new JPanel(new FlowLayout());
-@@ -877,31 +931,31 @@ final class JASHist2DPropStyle extends PropertyPage
- plotSchemePanel.add(colorMapLabel);
- plotSchemePanel.add(colorMapScheme);
-
-- p.add("0 0 5 1",plotSchemePanel);
--
-+ panel.add(plotSchemePanel, new GridBagConstraints(0, 0, 5, 1, 100, 100, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-+
- shapeColorLabel = new JLabel("Bin Color");
- shapeColor = new ColorChooser(Color.black);
-
-- p.add("1 1 w",shapeColor);
-- p.add("0 1 Wr",shapeColorLabel);
--
-+ panel.add(shapeColor, new GridBagConstraints(1, 1, 1, 1, 0, 100, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(shapeColorLabel, new GridBagConstraints(0, 1, 1, 1, 100, 100, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-+
- startColorLabel = new JLabel("Set Range Min");
- startColor = new ColorChooser(Color.white);
-
-- p.add("3 1 w",startColor);
-- p.add("2 1 Wr",startColorLabel);
--
-+ panel.add(startColor, new GridBagConstraints(3, 1, 1, 1, 0, 100, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(startColorLabel, new GridBagConstraints(2, 1, 1, 1, 100, 100, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-+
- overFlowColorLabel = new JLabel("OverFlow Color");
- overFlowColor = new ColorChooser(Color.red);
-
-- p.add("1 2 w",overFlowColor);
-- p.add("0 2 Wr",overFlowColorLabel);
--
-+ panel.add(overFlowColor, new GridBagConstraints(1, 2, 1, 1, 0, 100, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(overFlowColorLabel, new GridBagConstraints(0, 2, 1, 1, 100, 100, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-+
- endColorLabel = new JLabel("Set Range Max");
- endColor = new ColorChooser(Color.black);
-
-- p.add("3 2 w",endColor);
-- p.add("2 2 Wr",endColorLabel);
-+ panel.add(endColor, new GridBagConstraints(3, 2, 1, 1, 0, 100, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-+ panel.add(endColorLabel, new GridBagConstraints(2, 2, 1, 1, 100, 100, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-
- invertRange = new JButton("Invert")
- {
-@@ -913,7 +967,7 @@ final class JASHist2DPropStyle extends PropertyPage
- }
- };
-
-- p.add("4 1 1 2 HWl",invertRange);
-+ panel.add(invertRange, new GridBagConstraints(4, 1, 1, 2, 100, 100, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-
- addBinding(new PropertyBinding(plotScheme,"HistStyle"));
- addBinding(new PropertyBinding(colorMapScheme,"ColorMapScheme"));
+ public final class JASHistPropertyDialog extends PropertyDialog
--
-tg: (4cf4a7d..) patch/tablelayout (depends on: master)
+tg: (4e7278f..) patch/tablelayout (depends on: patch/pom.xml)
hooks/post-receive
--
JAS(2) Plotter
More information about the pkg-java-commits
mailing list