Author: dandre
Date: Thu Oct  3 01:28:16 2013
New Revision: 4591

Log:
* more dialog box refactoring

Modified:
   trunk/AncestrisCore/core.report/src/genj/report/Report.java
   
trunk/AncestrisCore/core/src/ancestris/core/actions/AbstractAncestrisAction.java
   trunk/AncestrisCore/core/src/ancestris/core/beans/ConfirmChangeWidget.java
   trunk/AncestrisCore/core/src/ancestris/gedcom/GedcomDirectory.java
   trunk/AncestrisCore/core/src/ancestris/util/swing/DialogManager.java
   trunk/AncestrisCore/core/src/genj/renderer/ChooseBlueprintAction.java
   trunk/AncestrisCore/core/src/genj/util/swing/DateWidget.java
   trunk/AncestrisCore/core/src/genj/util/swing/DialogHelper.java
   trunk/AncestrisCore/modules.editors.gedcom/src/genj/edit/AdvancedEditor.java
   trunk/AncestrisExtensions/report.rdf/src/genjreports/rdf/ReportRdf.java

Modified: trunk/AncestrisCore/core.report/src/genj/report/Report.java
==============================================================================
--- trunk/AncestrisCore/core.report/src/genj/report/Report.java (original)
+++ trunk/AncestrisCore/core.report/src/genj/report/Report.java Thu Oct  3 
01:28:16 2013
@@ -95,6 +95,11 @@
     new String[]{AbstractAncestrisAction.TXT_OK , 
AbstractAncestrisAction.TXT_CANCEL },
     new String[]{AbstractAncestrisAction.TXT_OK }
   };
+  private final static int[] OPTION_TYPE = {
+      DialogManager.YES_NO_OPTION,
+      DialogManager.OK_CANCEL_OPTION,
+      DialogManager.OK_ONLY_OPTION
+  };
 
   /** alignment options */
   protected final static int
@@ -400,9 +405,12 @@
       select.setSelection(entity);
 
     // show it
-    int rc = 
DialogHelper.openDialog(getName(),DialogHelper.QUESTION_MESSAGE,new 
JComponent[]{new JLabel(msg),select},AbstractAncestrisAction.okCancel(),owner);
-    if (rc!=0)
-      return null;
+    if (DialogManager.create(getName(), new JComponent[]{new 
JLabel(msg),select})
+            .setMessageType(DialogManager.QUESTION_MESSAGE)
+            .setOptionType(DialogManager.OK_CANCEL_OPTION)
+            .show() != DialogManager.OK_OPTION){
+        return null;
+    }
 
     // remember selection
     Entity result = select.getSelection();
@@ -432,9 +440,15 @@
     ChoiceWidget choice = new ChoiceWidget(choices, selected);
     choice.setEditable(false);
 
-    int rc = 
DialogHelper.openDialog(getName(),DialogHelper.QUESTION_MESSAGE,new 
JComponent[]{new JLabel(msg),choice},AbstractAncestrisAction.okCancel(),owner);
+    // show it
+    if (DialogManager.create(getName(), new JComponent[]{new 
JLabel(msg),choice})
+            .setMessageType(DialogManager.QUESTION_MESSAGE)
+            .setOptionType(DialogManager.OK_CANCEL_OPTION)
+            .show() != DialogManager.OK_OPTION){
+        return null;
+    }
 
-    return rc==0 ? choice.getSelectedItem() : null;
+    return choice.getSelectedItem();
   }
 
   /**
@@ -460,8 +474,14 @@
 
     // show 'em
     ChoiceWidget choice = new ChoiceWidget(defaultChoices, 
defaultChoices.length>0 ? defaultChoices[0] : "");
-    int rc = 
DialogHelper.openDialog(getName(),DialogHelper.QUESTION_MESSAGE,new 
JComponent[]{new JLabel(msg),choice},AbstractAncestrisAction.okCancel(),owner);
-    String result = rc==0 ? choice.getText() : null;
+    // show it
+    if (DialogManager.create(getName(), new JComponent[]{new 
JLabel(msg),choice})
+            .setMessageType(DialogManager.QUESTION_MESSAGE)
+            .setOptionType(DialogManager.OK_CANCEL_OPTION)
+            .show() != DialogManager.OK_OPTION){
+        return null;
+    }
+    String result = choice.getText();
 
     // Remember?
     if (key!=null&&result!=null&&result.length()>0) {
@@ -533,20 +553,11 @@
    * @param option one of OPTION_YESNO, OPTION_OKCANCEL, OPTION_OK
    */
   public final boolean getOptionFromUser(String msg, int option) {
-    return 0==getOptionFromUser(msg, OPTION_TEXTS[option]);
-  }
-
-  /**
-   * Helper method that queries the user for yes/no input
-   */
-  private int getOptionFromUser(String msg, String[] actions) {
-
-    Action[] as  = new Action[actions.length];
-    for (int i=0;i<as.length;i++)
-      as[i]  = new AbstractAncestrisAction(actions[i]);
-
-    return DialogHelper.openDialog(getName(), DialogHelper.QUESTION_MESSAGE, 
msg, as, owner);
-
+      Object result = DialogManager.create(getName(), msg)
+              .setMessageType(DialogManager.QUESTION_MESSAGE)
+              .setOptionType(OPTION_TYPE[option])
+              .show();
+      return result == DialogManager.OK_OPTION || result == 
DialogManager.YES_OPTION;
   }
 
   /**

Modified: 
trunk/AncestrisCore/core/src/ancestris/core/actions/AbstractAncestrisAction.java
==============================================================================
--- 
trunk/AncestrisCore/core/src/ancestris/core/actions/AbstractAncestrisAction.java
    (original)
+++ 
trunk/AncestrisCore/core/src/ancestris/core/actions/AbstractAncestrisAction.java
    Thu Oct  3 01:28:16 2013
@@ -138,23 +138,6 @@
         return m;
     }
 
-    /** convenience factory
-     *
-     * @deprecated
-     */
-    @Deprecated
-    public static AbstractAncestrisAction yes() {
-        return new Constant(AbstractAncestrisAction.TXT_YES);
-    }
-
-    /** convenience factory
-     *
-     * @deprecated
-     */
-    @Deprecated
-    public static AbstractAncestrisAction no() {
-        return new Constant(AbstractAncestrisAction.TXT_NO);
-    }
 
     /** convenience factory
      *
@@ -179,24 +162,6 @@
      * @deprecated
      */
     @Deprecated
-    public static AbstractAncestrisAction[] yesNo() {
-        return new AbstractAncestrisAction[]{yes(), no()};
-    }
-
-    /** convenience factory
-     *
-     * @deprecated
-     */
-    @Deprecated
-    public static AbstractAncestrisAction[] yesNoCancel() {
-        return new AbstractAncestrisAction[]{yes(), no(), cancel()};
-    }
-
-    /** convenience factory
-     *
-     * @deprecated
-     */
-    @Deprecated
     public static AbstractAncestrisAction[] okCancel() {
         return new AbstractAncestrisAction[]{ok(), cancel()};
     }

Modified: 
trunk/AncestrisCore/core/src/ancestris/core/beans/ConfirmChangeWidget.java
==============================================================================
--- trunk/AncestrisCore/core/src/ancestris/core/beans/ConfirmChangeWidget.java  
(original)
+++ trunk/AncestrisCore/core/src/ancestris/core/beans/ConfirmChangeWidget.java  
Thu Oct  3 01:28:16 2013
@@ -14,6 +14,7 @@
 import ancestris.core.AncestrisCorePlugin;
 import genj.util.Registry;
 import ancestris.core.actions.AbstractAncestrisAction;
+import ancestris.util.swing.DialogManager;
 import genj.util.swing.ButtonHelper;
 import genj.util.swing.DialogHelper;
 import java.awt.FlowLayout;
@@ -79,16 +80,15 @@
         JCheckBox auto = new JCheckBox(BUNDLE.getString("confirm.autocomit"));
         auto.setFocusable(false);
 
-        int rc = DialogHelper.openDialog(
+        if (DialogManager.create(
                 BUNDLE.getString("confirm.keep.changes"),
-                DialogHelper.QUESTION_MESSAGE, new JComponent[]{
+                new JComponent[]{
                     new JLabel(BUNDLE.getString("confirm.keep.changes")),
                     auto
-                },
-                AbstractAncestrisAction.yesNo(),
-                this);
-
-        if (rc != 0) {
+                })
+                .setMessageType(DialogManager.QUESTION_MESSAGE)
+                .setOptionType(DialogManager.YES_NO_OPTION)
+                .show() != DialogManager.YES_OPTION){
             return false;
         }
 

Modified: trunk/AncestrisCore/core/src/ancestris/gedcom/GedcomDirectory.java
==============================================================================
--- trunk/AncestrisCore/core/src/ancestris/gedcom/GedcomDirectory.java  
(original)
+++ trunk/AncestrisCore/core/src/ancestris/gedcom/GedcomDirectory.java  Thu Oct 
 3 01:28:16 2013
@@ -384,14 +384,16 @@
         if (context.getGedcom().hasChanged()) {
 
             // close file officially
-            int rc = DialogHelper.openDialog(null, 
DialogHelper.WARNING_MESSAGE,
-                    RES.getString("cc.savechanges?", 
context.getGedcom().getName()), AbstractAncestrisAction.yesNoCancel(), null);
+            Object rc = DialogManager.create(null, 
RES.getString("cc.savechanges?", context.getGedcom().getName()))
+                    .setMessageType(DialogManager.WARNING_MESSAGE)
+                    .setOptionType(DialogManager.YES_NO_CANCEL_OPTION)
+                    .show();
             // cancel - we're done
-            if (rc == 2) {
+            if (rc == DialogManager.CANCEL_OPTION || rc == 
DialogManager.CLOSED_OPTION) {
                 return false;
             }
             // yes - close'n save it
-            if (rc == 0) {
+            if (rc == DialogManager.YES_OPTION) {
                 if (!saveGedcom(context)) {
                     return false;
                 }

Modified: trunk/AncestrisCore/core/src/ancestris/util/swing/DialogManager.java
==============================================================================
--- trunk/AncestrisCore/core/src/ancestris/util/swing/DialogManager.java        
(original)
+++ trunk/AncestrisCore/core/src/ancestris/util/swing/DialogManager.java        
Thu Oct  3 01:28:16 2013
@@ -9,7 +9,9 @@
 import java.awt.Dialog;
 import java.awt.Dimension;
 import java.awt.Rectangle;
+import javax.swing.BoxLayout;
 import javax.swing.JComponent;
+import javax.swing.JPanel;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import org.openide.DialogDescriptor;
@@ -31,11 +33,15 @@
             PLAIN_MESSAGE = NotifyDescriptor.PLAIN_MESSAGE;
     public static final int 
             OK_CANCEL_OPTION = DialogDescriptor.OK_CANCEL_OPTION,
-            YES_NO_OPTION = NotifyDescriptor.YES_NO_OPTION;
+            YES_NO_OPTION = NotifyDescriptor.YES_NO_OPTION,
+            YES_NO_CANCEL_OPTION = NotifyDescriptor.YES_NO_CANCEL_OPTION,
+            OK_ONLY_OPTION = 10;;
+    
     /** Return value if OK is chosen. */
     public static final Object OK_OPTION = DialogDescriptor.OK_OPTION;
     public static final Object CANCEL_OPTION = DialogDescriptor.CANCEL_OPTION;
     public static final Object YES_OPTION = DialogDescriptor.YES_OPTION;
+    public static final Object CLOSED_OPTION = DialogDescriptor.CLOSED_OPTION;
 
     public static Object show(String title, int messageType, String txt, 
Object[] options) {
         NotifyDescriptor d = new NotifyDescriptor(txt, title, 
NotifyDescriptor.DEFAULT_OPTION, messageType, options, null);
@@ -50,6 +56,22 @@
         return new ADialog(title, content);
     }
 
+    public static ADialog create(String title, JComponent[] content) {
+            // assemble content into Box (don't use Box here because
+        // Box extends Container in pre JDK 1.4)
+        JPanel box = new JPanel();
+        box.setLayout(new BoxLayout(box, BoxLayout.Y_AXIS));
+        for (int i = 0; i < content.length; i++) {
+            if (content[i] == null) {
+                continue;
+            }
+            box.add(content[i]);
+            content[i].setAlignmentX(0F);
+
+        }
+        return create(title, box);
+    }
+    
     public static InputLine create(String title, String text, String value) {
         return new InputLine(title, text, value);
     }
@@ -66,6 +88,10 @@
         return new Message(title, text).setMessageType(ERROR_MESSAGE);
     }
 
+    public static DialogManager create(String title, String text) {
+        return new Message(title, text);
+    }
+
     /**
      * Creates a simple question dialog message with only a yes and no button.
      * Message type defaults to QUESTION_MESSAGE
@@ -148,9 +174,13 @@
     }
 
     public DialogManager setOptionType(int newType) {
-        getDescriptor().setOptions(null);
-        getDescriptor().setOptionType(newType);
-        return this;
+        if (newType == OK_ONLY_OPTION){
+            return setOptions(new Object [] {OK_OPTION});
+        } else {
+            getDescriptor().setOptions(null);
+            getDescriptor().setOptionType(newType);
+            return this;
+        }
     }
 
     public DialogManager setMessageType(int newType) {

Modified: trunk/AncestrisCore/core/src/genj/renderer/ChooseBlueprintAction.java
==============================================================================
--- trunk/AncestrisCore/core/src/genj/renderer/ChooseBlueprintAction.java       
(original)
+++ trunk/AncestrisCore/core/src/genj/renderer/ChooseBlueprintAction.java       
Thu Oct  3 01:28:16 2013
@@ -169,8 +169,11 @@
       Blueprint selection = (Blueprint)blueprints.getSelectedValue();
       if (selection==null||selection.isReadOnly())
         return;
-      if 
(0!=DialogHelper.openDialog(null,DialogHelper.WARNING_MESSAGE,RESOURCES.getString("blueprint.del.confirm",
 selection.getName()),AbstractAncestrisAction.okCancel(),e))
-        return;
+      if (DialogManager.create((String)null, 
RESOURCES.getString("blueprint.del.confirm", selection.getName()))
+              .setMessageType(DialogManager.WARNING_MESSAGE)
+              .setOptionType(DialogManager.OK_CANCEL_OPTION)
+              .show() != DialogManager.OK_OPTION)
+          return;
       
       try {
         MGR.delBlueprint(selection);

Modified: trunk/AncestrisCore/core/src/genj/util/swing/DateWidget.java
==============================================================================
--- trunk/AncestrisCore/core/src/genj/util/swing/DateWidget.java        
(original)
+++ trunk/AncestrisCore/core/src/genj/util/swing/DateWidget.java        Thu Oct 
 3 01:28:16 2013
@@ -20,21 +20,19 @@
 package genj.util.swing;
 
 import ancestris.core.actions.AbstractAncestrisAction;
+import ancestris.util.swing.DialogManager;
 import genj.gedcom.GedcomException;
 import genj.gedcom.MetaProperty;
 import genj.gedcom.time.Calendar;
 import genj.gedcom.time.PointInTime;
 import genj.util.ChangeSupport;
 import genj.util.WordBuffer;
-
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
-import javax.swing.Action;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -42,7 +40,6 @@
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.PlainDocument;
-import org.openide.util.Exceptions;
 
 /**
  * Generic component for editing dates
@@ -177,7 +174,7 @@
       preferedCalendar = prefered;
   }
 
-  private class TabbingDoc extends PlainDocument {
+  private static class TabbingDoc extends PlainDocument {
     private JComponent next;
 
     public TabbingDoc(JComponent next) {
@@ -227,7 +224,7 @@
   /**
    * Set current value
    */
-  public void setValue(PointInTime pit) {
+  public final void setValue(PointInTime pit) {
 
     // keep calendar
     calendar = pit.getCalendar();
@@ -330,7 +327,7 @@
     }
 
       if (helpCalendar == null){
-          altDisplay.setVisible(false);;
+          altDisplay.setVisible(false);
             altDisplay.setText("");
       } else {
         altDisplay.setVisible(true);
@@ -354,6 +351,7 @@
   /**
    * Return the maximum size this component should be sized to
    */
+    @Override
   public Dimension getMaximumSize() {
     return new Dimension(super.getMaximumSize().width, 
super.getPreferredSize().height);
   }
@@ -361,6 +359,7 @@
   /**
    * @see javax.swing.JComponent#requestFocus()
    */
+    @Override
   public void requestFocus() {
     getComponent(0).requestFocus();
   }
@@ -368,6 +367,7 @@
   /**
    * @see javax.swing.JComponent#requestFocusInWindow()
    */
+    @Override
   public boolean requestFocusInWindow() {
     return getComponent(0).requestFocusInWindow();
   }
@@ -428,16 +428,20 @@
     /**
      * @see genj.util.swing.AbstractAncestrisAction#execute()
      */
+        @Override
     public void actionPerformed(ActionEvent event) {
       PointInTime pit = DateWidget.this.getValue();
       if (pit != null) {
         try {
           pit.set(newCalendar);
         } catch (GedcomException e) {
-          Action[] actions = { AbstractAncestrisAction.ok(), new 
AbstractAncestrisAction(Calendar.TXT_CALENDAR_RESET) };
-          int rc = DialogHelper.openDialog(Calendar.TXT_CALENDAR_SWITCH, 
DialogHelper.ERROR_MESSAGE, e.getMessage(), actions, DateWidget.this);
-          if (rc == 0)
+            String reset = Calendar.TXT_CALENDAR_RESET;
+          if (DialogManager.create(Calendar.TXT_CALENDAR_SWITCH, 
e.getMessage())
+                  .setMessageType(DialogManager.ERROR_MESSAGE)
+                  .setOptions(new Object[]{DialogManager.OK_OPTION,reset})
+                  .show() == DialogManager.OK_OPTION){
             return;
+        }
           pit = new PointInTime(newCalendar);
         }
         // change

Modified: trunk/AncestrisCore/core/src/genj/util/swing/DialogHelper.java
==============================================================================
--- trunk/AncestrisCore/core/src/genj/util/swing/DialogHelper.java      
(original)
+++ trunk/AncestrisCore/core/src/genj/util/swing/DialogHelper.java      Thu Oct 
 3 01:28:16 2013
@@ -19,8 +19,6 @@
  */
 package genj.util.swing;
 
-import ancestris.core.actions.AbstractAncestrisAction;
-import ancestris.util.swing.DialogManager;
 import genj.util.Registry;
 import java.awt.BorderLayout;
 import java.awt.Component;
@@ -36,7 +34,6 @@
 import java.awt.event.ComponentEvent;
 import java.util.EventObject;
 import javax.swing.Action;
-import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
@@ -65,126 +62,7 @@
     /** screen we're dealing with */
     private final static Rectangle screen = new 
Rectangle(Toolkit.getDefaultToolkit().getScreenSize());
     /** message types */
-    public static final int ERROR_MESSAGE = NotifyDescriptor.ERROR_MESSAGE,
-            INFORMATION_MESSAGE = NotifyDescriptor.INFORMATION_MESSAGE,
-            WARNING_MESSAGE = NotifyDescriptor.WARNING_MESSAGE,
-            QUESTION_MESSAGE = NotifyDescriptor.QUESTION_MESSAGE,
-            PLAIN_MESSAGE = NotifyDescriptor.PLAIN_MESSAGE;
-
-    /**
-     * Convert actions argument to openDialog (old Genj API) to options
-     * argument for NetBeans framework.
-     *
-     * @param actions
-     *
-     * @return
-     */
-    private static Object[] actions2options(Action[] actions) {
-        Object options[] = new Object[actions.length];
-        for (int i = 0; i < actions.length; i++) {
-            if (actions[i] instanceof AbstractAncestrisAction) {
-                AbstractAncestrisAction a = (AbstractAncestrisAction) 
(actions[i]);
-                if (a.equals(AbstractAncestrisAction.cancel())) {
-                    options[i] = NotifyDescriptor.CANCEL_OPTION;
-                    continue;
-                }
-                if (a.equals(AbstractAncestrisAction.ok())) {
-                    options[i] = NotifyDescriptor.OK_OPTION;
-                    continue;
-                }
-                if (a.equals(AbstractAncestrisAction.yes())) {
-                    options[i] = NotifyDescriptor.YES_OPTION;
-                    continue;
-                }
-                if (a.equals(AbstractAncestrisAction.no())) {
-                    options[i] = NotifyDescriptor.NO_OPTION;
-                    continue;
-                }
-                options[i] = a.getText();
-                continue;
-            }
-            options[i] = actions[i];
-        }
-        return options;
-    }
-
-    /**
-     * convert NetBeans object dialog return value to old (Genj) action index.
-     * In fact return index in previously computed options array of return 
value. If not found
-     * returns Cancel object index or -1.
-     *
-     * @param returnValue
-param options
-     *
-     * @return
-     */
-    private static int getResult(Object returnValue, Object[] options) {
-        // close w/o any button means cancel
-        if (NotifyDescriptor.CLOSED_OPTION.equals(returnValue)) {
-            returnValue = NotifyDescriptor.CANCEL_OPTION;
-        }
-
-        for (int a = 0; a < options.length; a++) {
-            if (returnValue == options[a]) {
-                return a;
-            }
-        }
-
-        // None found: tries with cancel
-        returnValue = NotifyDescriptor.CANCEL_OPTION;
-        for (int a = 0; a < options.length; a++) {
-            if (returnValue == options[a]) {
-                return a;
-            }
-        }
-        return -1;
-    }
-
-    /**
-     *
-     * @param title
-     *param messageType
-param txt
-     * @param actions
-    param source
-     *
-     * @return
-     *
-     * @deprecated use DialogManager
-     */
-    @Deprecated
-    public static int openDialog(String title, int messageType, String txt, 
Action[] actions, Object source) {
-
-        Object options[] = actions2options(actions);
-        return getResult(DialogManager.show(title, messageType, txt, options), 
options);
-    }
-
-    /**
-     * @see genj.window.WindowManager#openDialog(java.lang.String, 
java.lang.String, javax.swing.Icon, java.awt.Dimension, 
javax.swing.JComponent[], java.lang.String[], javax.swing.JComponent)
-     */
-    @Deprecated
-    public static int openDialog(String title, int messageType, JComponent[] 
content, Action[] actions, Object source) {
-        // assemble content into Box (don't use Box here because
-        // Box extends Container in pre JDK 1.4)
-        JPanel box = new JPanel();
-        box.setLayout(new BoxLayout(box, BoxLayout.Y_AXIS));
-        for (int i = 0; i < content.length; i++) {
-            if (content[i] == null) {
-                continue;
-            }
-            box.add(content[i]);
-            content[i].setAlignmentX(0F);
-
-        }
-        Object options[] = actions2options(actions);
-
-        // delegate
-        return getResult(DialogManager.create(title, box)
-                .setMessageType(messageType)
-                .setOptions(options)
-                //XXX: .setDialogId("")
-                .show(),options);
-    }
+    public static final int QUESTION_MESSAGE = 
NotifyDescriptor.QUESTION_MESSAGE;
 
     public static Window getWindow(EventObject event) {
         if (!(event.getSource() instanceof Component)) {

Modified: 
trunk/AncestrisCore/modules.editors.gedcom/src/genj/edit/AdvancedEditor.java
==============================================================================
--- 
trunk/AncestrisCore/modules.editors.gedcom/src/genj/edit/AdvancedEditor.java    
    (original)
+++ 
trunk/AncestrisCore/modules.editors.gedcom/src/genj/edit/AdvancedEditor.java    
    Thu Oct  3 01:28:16 2013
@@ -514,8 +514,11 @@
             // warn about cut
             String veto = getVeto(selection);
             if (veto.length() > 0) {
-                int rc = 
DialogHelper.openDialog(resources.getString("action.cut"), 
DialogHelper.WARNING_MESSAGE, veto, new Action[]{new 
AbstractAncestrisAction(resources.getString("action.cut")), 
AbstractAncestrisAction.cancel()}, AdvancedEditor.this);
-                if (rc != 0) {
+                String cut = resources.getString("action.cut");
+                if (DialogManager.create(resources.getString("action.cut"), 
veto)
+                        .setMessageType(DialogManager.WARNING_MESSAGE)
+                        .setOptions(new 
Object[]{cut,DialogManager.CANCEL_OPTION})
+                        .show() != cut) {
                     return;
                 }
             }
@@ -731,8 +734,10 @@
                 JLabel label = new JLabel(resources.getString("add.choose"));
                 ChoosePropertyBean choose = new ChoosePropertyBean(parent);
                 JCheckBox check = new 
JCheckBox(resources.getString("add.default_too"), addDefaults);
-                int option = 
DialogHelper.openDialog(resources.getString("add.title"), 
DialogHelper.QUESTION_MESSAGE, new JComponent[]{label, choose, check}, 
AbstractAncestrisAction.okCancel(), AdvancedEditor.this);
-                if (option != 0) {
+                if (DialogManager.create(resources.getString("add.title"), new 
JComponent[]{label, choose, check})
+                        .setMessageType(DialogManager.QUESTION_MESSAGE)
+                        .setOptionType(DialogManager.OK_CANCEL_OPTION)
+                        .show() != DialogManager.OK_OPTION){
                     return;
                 }
                 // .. calculate chosen tags

Modified: 
trunk/AncestrisExtensions/report.rdf/src/genjreports/rdf/ReportRdf.java
==============================================================================
--- trunk/AncestrisExtensions/report.rdf/src/genjreports/rdf/ReportRdf.java     
(original)
+++ trunk/AncestrisExtensions/report.rdf/src/genjreports/rdf/ReportRdf.java     
Thu Oct  3 01:28:16 2013
@@ -1,9 +1,19 @@
 package genjreports.rdf;
 
+import ancestris.util.swing.DialogManager;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryParseException;
+import com.hp.hpl.jena.query.QuerySolutionMap;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.query.ResultSetFormatter;
+import com.hp.hpl.jena.query.Syntax;
+import com.hp.hpl.jena.rdf.model.InfModel;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
 import genj.gedcom.Entity;
 import genj.gedcom.Gedcom;
 import genj.report.Report;
-import genj.util.swing.DialogHelper;
 import genjreports.rdf.gedsem.SemanticGedcomUtil;
 import genjreports.rdf.gedsem.UriFormats;
 import genjreports.rdf.semweb.Extension;

---------------------------------------------------------------------
Site Web Ancestris : http://www.ancestris.org

<*> Pour vous desinscrire de cette liste, envoyez un mail a :
              [email protected]
<*> Pour obtenir de l'aide sur les commandes de la liste :
              [email protected]

Pour obtenir tous les messages lies a ce fil de discussion, cliquez sur le 
lien ci-dessous, cela ouvrira votre logiciel de messagerie. Il vous suffira 
d'envoyer le message :
              [email protected]

Reply via email to