[pkg-java] r17390 - in trunk/jajuk/debian: . patches
Andrew Ross
rockclimb-guest at alioth.debian.org
Fri Nov 1 18:43:12 UTC 2013
Author: rockclimb-guest
Date: 2013-11-01 18:43:11 +0000 (Fri, 01 Nov 2013)
New Revision: 17390
Added:
trunk/jajuk/debian/patches/03_validation.diff
Modified:
trunk/jajuk/debian/changelog
trunk/jajuk/debian/control
trunk/jajuk/debian/patches/series
Log:
Build against newer libsimple-validation-java
Modified: trunk/jajuk/debian/changelog
===================================================================
--- trunk/jajuk/debian/changelog 2013-10-31 21:31:16 UTC (rev 17389)
+++ trunk/jajuk/debian/changelog 2013-11-01 18:43:11 UTC (rev 17390)
@@ -1,11 +1,16 @@
jajuk (1:1.9.6-7) UNRELEASED; urgency=low
+ [ Emmanuel Bourg ]
* Team upload.
* d/control: Use canonical URLs for the Vcs-* fields
* d/control: Updated Standards-Version to 3.9.4 (no changes)
- -- Emmanuel Bourg <ebourg at apache.org> Wed, 11 Sep 2013 23:11:56 +0200
+ [ Andrew Ross ]
+ * Add patch 03_validation.diff to permit build with newer
+ libsimple-validation-java.
+ -- Andrew Ross <ubuntu at rossfamily.co.uk> Fri, 01 Nov 2013 18:26:40 +0000
+
jajuk (1:1.9.6-6) unstable; urgency=low
[ James Page ]
Modified: trunk/jajuk/debian/control
===================================================================
--- trunk/jajuk/debian/control 2013-10-31 21:31:16 UTC (rev 17389)
+++ trunk/jajuk/debian/control 2013-11-01 18:43:11 UTC (rev 17390)
@@ -33,7 +33,7 @@
liblog4j1.2-java,
libmiglayout-java,
libmp3spi-java,
- libsimple-validation-java,
+ libsimple-validation-java (>= 0.9),
libswingx-java (>= 1:1.6),
libtritonus-java,
libvldocking-java,
Added: trunk/jajuk/debian/patches/03_validation.diff
===================================================================
--- trunk/jajuk/debian/patches/03_validation.diff (rev 0)
+++ trunk/jajuk/debian/patches/03_validation.diff 2013-11-01 18:43:11 UTC (rev 17390)
@@ -0,0 +1,130 @@
+Build against the newer libsimple-validation-java API.
+
+--- a/src/main/java/org/jajuk/ui/wizard/DeviceWizard.java
++++ b/src/main/java/org/jajuk/ui/wizard/DeviceWizard.java
+@@ -41,7 +41,8 @@
+ import javax.swing.JLabel;
+ import javax.swing.JRadioButton;
+ import javax.swing.JTextField;
+-
++import javax.swing.event.ChangeEvent;
++import javax.swing.event.ChangeListener;
+ import net.miginfocom.swing.MigLayout;
+
+ import org.jajuk.base.Device;
+@@ -66,9 +67,10 @@
+ import org.netbeans.validation.api.Problems;
+ import org.netbeans.validation.api.Severity;
+ import org.netbeans.validation.api.Validator;
+-import org.netbeans.validation.api.builtin.Validators;
++import org.netbeans.validation.api.AbstractValidator;
++import org.netbeans.validation.api.builtin.stringvalidation.StringValidators;
+ import org.netbeans.validation.api.ui.ValidationGroup;
+-import org.netbeans.validation.api.ui.ValidationPanel;
++import org.netbeans.validation.api.ui.swing.ValidationPanel;
+
+ /**
+ * Device creation wizard.
+@@ -135,6 +137,8 @@
+ /** Validation group. */
+ private ValidationGroup vg;
+
++ private ChangeListener vglistener;
++
+ /**
+ * Device wizard by default, is used for void configuration.
+ */
+@@ -211,15 +215,22 @@
+ bgSynchro.add(jrbBidirSynchro);
+ bgSynchro.add(jrbUnidirSynchro);
+
++ // buttons
++ okp = new OKCancelPanel(this);
++ okp.getOKButton().setEnabled(false);
++
+ // Validation
+ ValidationPanel vp = new ValidationPanel();
+ vg = vp.getValidationGroup();
+
+ installValidators();
+
+- // buttons
+- okp = new OKCancelPanel(this);
+- okp.getOKButton().setEnabled(false);
++ vp.addChangeListener(new ChangeListener() {
++ public void stateChanged(ChangeEvent changeEvent) {
++ ValidationPanel v = (ValidationPanel)changeEvent.getSource();
++ okp.getOKButton().setEnabled(v.getProblem()==null);
++ }
++ });
+
+ // Add items
+ setLayout(new MigLayout("insets 10,gapx 10, gapy 15", "[][grow]"));
+@@ -259,51 +270,40 @@
+ @SuppressWarnings("unchecked")
+ private void installValidators() {
+ // Auto-refresh interval validation : should be 0 or a double >= 0.5
+- vg.add(jtfAutoRefresh, Validators.REQUIRE_NON_NEGATIVE_NUMBER, Validators.NO_WHITESPACE,
+- Validators.REQUIRE_VALID_NUMBER, new Validator<String>() {
++ vg.add(jtfAutoRefresh, StringValidators.REQUIRE_NON_NEGATIVE_NUMBER, StringValidators.NO_WHITESPACE,
++ StringValidators.REQUIRE_VALID_NUMBER, new AbstractValidator<String>(String.class) {
+ @Override
+- public boolean validate(Problems problems, String compName, String model) {
++ public void validate(Problems problems, String compName, String model) {
+ try {
+ double value = nformat.parse(model).doubleValue();
+ // If value is zero, validate the user input
+ boolean resu = (value == 0 || value >= 0.5d);
+ // If a problem occurred, add this problem to the problem stack
+ if (!resu) {
+- Problem problem = new Problem(Messages.getString("DeviceWizard.55"), Severity.FATAL);
+- problems.add(problem);
++ problems.add(Messages.getString("DeviceWizard.55"), Severity.FATAL);
+ }
+- // Disable the wizard OK button if user selection is not in the
+- // right interval or if previous validators thrown an error
+- // already
+- okp.getOKButton().setEnabled(resu && problems.isEmpty());
+- return resu;
++ return;
+ } catch (Exception e) {
+ // This happen when the text field is not yet populated (model is
+ // void). Note that wrong number format issues are already handled
+ // by the previous Validators
+- okp.getOKButton().setEnabled(false);
+- return true;
++ return;
+ }
+ }
+ });
+
+ // Validate device name
+- vg.add(jtfName, Validators.REQUIRE_NON_EMPTY_STRING);
+- vg.add(jtfName, new Validator<String>() {
++ vg.add(jtfName, StringValidators.REQUIRE_NON_EMPTY_STRING);
++ vg.add(jtfName, new AbstractValidator<String>(String.class) {
+ @Override
+- public boolean validate(Problems problems, String compName, String model) {
+- // By default, we disable the OK button, we re-enable it only if the
+- // name is OK
+- okp.getOKButton().setEnabled(false);
+- for (Device deviceToCheck : DeviceManager.getInstance().getDevices()) {
+- // check for a new device with an existing name
+- if (bNew && (jtfName.getText().equalsIgnoreCase(deviceToCheck.getName()))) {
+- problems.add(new Problem(Messages.getErrorMessage(19), Severity.FATAL));
+- return false;
+- }
+- }
+- okp.getOKButton().setEnabled(problems.isEmpty());
+- return true;
++ public void validate(Problems problems, String compName, String model) {
++ for (Device deviceToCheck : DeviceManager.getInstance().getDevices()) {
++ // check for a new device with an existing name
++ if (bNew && (jtfName.getText().equalsIgnoreCase(deviceToCheck.getName()))) {
++ problems.add(new Problem(Messages.getErrorMessage(19), Severity.FATAL));
++ return;
++ }
++ }
+ }
+ });
+ }
Modified: trunk/jajuk/debian/patches/series
===================================================================
--- trunk/jajuk/debian/patches/series 2013-10-31 21:31:16 UTC (rev 17389)
+++ trunk/jajuk/debian/patches/series 2013-11-01 18:43:11 UTC (rev 17390)
@@ -1,2 +1,3 @@
01_override_manifest.diff
02_lastfm_fix_0_1_0.diff
+03_validation.diff
More information about the pkg-java-commits
mailing list