[SCM] JAS(2) Plotter branch, build, updated. upstream/2.2.6-18-gebff4fd
Giovanni Mascellani
gmascellani-guest at alioth.debian.org
Fri Jan 8 11:07:31 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 ebff4fd014c323edcca9a450c60349e13b33d295 (commit)
via 1426e4155e1bb5befcd584a0b47d43031765c80d (commit)
via 4cf4a7dd5a3ec281817f0c542e93ee53204f9a21 (commit)
from 29687b9b4084fc9a66909f95d844f02632fae19d (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 ebff4fd014c323edcca9a450c60349e13b33d295
Merge: 1426e4155e1bb5befcd584a0b47d43031765c80d 4cf4a7dd5a3ec281817f0c542e93ee53204f9a21
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Fri Jan 8 12:03:56 2010 +0100
Merge branch 'master' into build
commit 1426e4155e1bb5befcd584a0b47d43031765c80d
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Fri Jan 8 12:03:37 2010 +0100
Quilt patches regenerated
-----------------------------------------------------------------------
Summary of changes:
debian/orig-tar.sh | 16 --
debian/patches/patch/tablelayout.diff | 299 +++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/watch | 6 +-
4 files changed, 302 insertions(+), 20 deletions(-)
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 92e3109..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-TAR=../jas-plotter_$VERSION.orig.tar.gz
-DIR=jas-plotter-$VERSION
-TAG=$(echo "jas-plotter-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
-
-svn export svn://svn.freehep.org/svn/freehep/tags/${TAG}/ $DIR
-GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
-rm -rf $DIR ../$TAG
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir && echo "moved $TAR to $origDir"
-fi
diff --git a/debian/patches/patch/tablelayout.diff b/debian/patches/patch/tablelayout.diff
new file mode 100644
index 0000000..f74ed89
--- /dev/null
+++ b/debian/patches/patch/tablelayout.diff
@@ -0,0 +1,299 @@
+From: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+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.
+
+Signed-off-by: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+
+---
+ src/main/java/jas/hist/JASHistPropertyDialog.java | 150 ++++++++++++++-------
+ 1 files changed, 102 insertions(+), 48 deletions(-)
+
+diff --git a/src/main/java/jas/hist/JASHistPropertyDialog.java b/src/main/java/jas/hist/JASHistPropertyDialog.java
+index 2d05d8a..aa14f7d 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;
+ import javax.swing.event.ChangeListener;
+ import javax.swing.event.ListSelectionEvent;
+ import javax.swing.event.ListSelectionListener;
+-import 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"));
+--
+tg: (4cf4a7d..) patch/tablelayout (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
index abd225c..fc48760 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
patch/pom.xml.diff -p1
+patch/tablelayout.diff -p1
diff --git a/debian/watch b/debian/watch
index 248505f..f1fc674 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
-version=3
-opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
- svn://svn.freehep.org/svn/freehep/tags/ \
- jas-plotter-(\d.*)/ debian debian/orig-tar.sh
+# Watch file missing, because upstream releases are available only via
+# SVN, but uscan is unable to read in a SVN repository.
hooks/post-receive
--
JAS(2) Plotter
More information about the pkg-java-commits
mailing list