Author: dandre
Date: Thu Oct 3 22:08:27 2013
New Revision: 4592
Log:
* organize imports
* remember choose root dialog box size
Modified:
trunk/AncestrisCore/core.report/src/genj/report/Report.java
trunk/AncestrisCore/core.report/src/genj/report/ReportView.java
trunk/AncestrisCore/core/src/ancestris/core/beans/ConfirmChangeWidget.java
trunk/AncestrisCore/core/src/ancestris/gedcom/GedcomDirectory.java
trunk/AncestrisCore/core/src/ancestris/gedcom/GedcomMgr.java
trunk/AncestrisCore/core/src/genj/option/CustomOption.java
trunk/AncestrisCore/core/src/genj/option/PropertyOption.java
trunk/AncestrisCore/core/src/genj/print/PrintAction.java
trunk/AncestrisCore/core/src/genj/renderer/BlueprintEditor.java
trunk/AncestrisCore/core/src/genj/renderer/ChooseBlueprintAction.java
trunk/AncestrisCore/core/src/genj/view/ScreenshotAction.java
trunk/AncestrisCore/core/src/genj/view/SettingsAction.java
trunk/AncestrisCore/document.view/src/ancestris/modules/document/view/HyperLinkTextDocumentView.java
trunk/AncestrisCore/modules.almanac/src/genj/timeline/TimelineViewSettings.java
trunk/AncestrisCore/modules.beans/src/genj/edit/beans/ChoiceBean.java
trunk/AncestrisCore/modules.beans/src/genj/edit/beans/MediaBean.java
trunk/AncestrisCore/modules.beans/src/genj/edit/beans/PlaceBean.java
trunk/AncestrisCore/modules.beans/src/genj/edit/beans/ShortNameBean.java
trunk/AncestrisCore/modules.beans/src/genj/edit/beans/XRefBean.java
trunk/AncestrisCore/modules.editors.gedcom/src/genj/edit/AdvancedEditor.java
trunk/AncestrisCore/modules.editors.gedcom/src/genj/edit/actions/AbstractChange.java
trunk/AncestrisCore/modules.editors.gedcom/src/genj/edit/actions/EditEvent.java
trunk/AncestrisCore/modules.editors.gedcom/src/genj/edit/actions/TogglePrivate.java
trunk/AncestrisCore/modules.views.tree/src/genj/tree/TreeView.java
trunk/AncestrisExtensions/CommonAncestor/src/ancestris/modules/commonAncestor/PreviewView.java
trunk/AncestrisExtensions/CommonAncestor/src/ancestris/modules/commonAncestor/SamePanel.java
trunk/AncestrisExtensions/gedcom.mergefile/src/ancestris/modules/gedcom/mergefile/GedcomMergeVisualPanel4.java
trunk/AncestrisExtensions/releve/src/ancestris/modules/releve/ReleveTopComponent.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
22:08:27 2013
@@ -38,10 +38,8 @@
import genj.util.Resources;
import genj.util.Resources.ResourcesProvider;
import genj.util.swing.ChoiceWidget;
-import genj.util.swing.DialogHelper;
import genj.util.swing.ImageIcon;
import java.awt.Component;
-import java.awt.Graphics;
import java.io.CharArrayWriter;
import java.io.File;
import java.io.IOException;
@@ -59,7 +57,6 @@
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.swing.Action;
import javax.swing.Icon;
import javax.swing.JComponent;
import javax.swing.JFileChooser;
Modified: trunk/AncestrisCore/core.report/src/genj/report/ReportView.java
==============================================================================
--- trunk/AncestrisCore/core.report/src/genj/report/ReportView.java
(original)
+++ trunk/AncestrisCore/core.report/src/genj/report/ReportView.java Thu Oct
3 22:08:27 2013
@@ -29,10 +29,8 @@
import genj.gedcom.Context;
import genj.gedcom.Entity;
import genj.gedcom.Gedcom;
-import genj.gedcom.Property;
import genj.util.Registry;
import genj.util.Resources;
-import genj.util.swing.DialogHelper;
import genj.util.swing.ImageIcon;
import genj.view.ToolBar;
import genj.view.View;
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 22:08:27 2013
@@ -12,11 +12,10 @@
package ancestris.core.beans;
import ancestris.core.AncestrisCorePlugin;
-import genj.util.Registry;
import ancestris.core.actions.AbstractAncestrisAction;
import ancestris.util.swing.DialogManager;
+import genj.util.Registry;
import genj.util.swing.ButtonHelper;
-import genj.util.swing.DialogHelper;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.util.ResourceBundle;
@@ -25,8 +24,6 @@
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.border.Border;
-import javax.swing.border.LineBorder;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.openide.util.NbBundle;
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 22:08:27 2013
@@ -24,14 +24,12 @@
import ancestris.core.pluginservice.PluginInterface;
import static ancestris.gedcom.Bundle.*;
import ancestris.util.TimingUtility;
+import ancestris.util.swing.DialogManager;
import ancestris.view.AncestrisViewInterface;
+import ancestris.view.SelectionDispatcher;
import genj.gedcom.*;
import genj.io.*;
import genj.util.*;
-import ancestris.core.actions.AbstractAncestrisAction;
-import ancestris.util.swing.DialogManager;
-import ancestris.view.SelectionDispatcher;
-import genj.util.swing.DialogHelper;
import genj.util.swing.FileChooser;
import java.beans.PropertyVetoException;
import java.io.File;
Modified: trunk/AncestrisCore/core/src/ancestris/gedcom/GedcomMgr.java
==============================================================================
--- trunk/AncestrisCore/core/src/ancestris/gedcom/GedcomMgr.java
(original)
+++ trunk/AncestrisCore/core/src/ancestris/gedcom/GedcomMgr.java Thu Oct
3 22:08:27 2013
@@ -14,6 +14,7 @@
import ancestris.core.pluginservice.AncestrisPlugin;
import ancestris.util.ProgressListener;
import ancestris.util.TimingUtility;
+import ancestris.util.swing.DialogManager;
import ancestris.view.AncestrisViewInterface;
import genj.common.ContextListWidget;
import genj.gedcom.Context;
@@ -33,9 +34,6 @@
import genj.util.Origin;
import genj.util.Registry;
import genj.util.Resources;
-import ancestris.core.actions.AbstractAncestrisAction;
-import ancestris.util.swing.DialogManager;
-import genj.util.swing.DialogHelper;
import genj.view.ViewContext;
import java.io.File;
import java.io.FileOutputStream;
Modified: trunk/AncestrisCore/core/src/genj/option/CustomOption.java
==============================================================================
--- trunk/AncestrisCore/core/src/genj/option/CustomOption.java (original)
+++ trunk/AncestrisCore/core/src/genj/option/CustomOption.java Thu Oct 3
22:08:27 2013
@@ -24,10 +24,7 @@
import ancestris.core.actions.AbstractAncestrisAction;
import ancestris.util.swing.DialogManager;
import genj.util.swing.ButtonHelper;
-import genj.util.swing.DialogHelper;
-
import java.awt.event.ActionEvent;
-
import javax.swing.JComponent;
import org.openide.DialogDescriptor;
Modified: trunk/AncestrisCore/core/src/genj/option/PropertyOption.java
==============================================================================
--- trunk/AncestrisCore/core/src/genj/option/PropertyOption.java
(original)
+++ trunk/AncestrisCore/core/src/genj/option/PropertyOption.java Thu Oct
3 22:08:27 2013
@@ -19,16 +19,13 @@
*/
package genj.option;
+import ancestris.util.swing.DialogManager;
import genj.util.Registry;
import genj.util.Resources;
-import ancestris.core.actions.AbstractAncestrisAction;
-import ancestris.util.swing.DialogManager;
-import genj.util.swing.DialogHelper;
import genj.util.swing.FileChooserWidget;
import genj.util.swing.FontChooser;
import genj.util.swing.GraphicsHelper;
import genj.util.swing.TextFieldWidget;
-
import java.awt.Color;
import java.awt.Font;
import java.awt.Insets;
@@ -50,7 +47,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import javax.swing.AbstractButton;
import javax.swing.JButton;
import javax.swing.JCheckBox;
Modified: trunk/AncestrisCore/core/src/genj/print/PrintAction.java
==============================================================================
--- trunk/AncestrisCore/core/src/genj/print/PrintAction.java (original)
+++ trunk/AncestrisCore/core/src/genj/print/PrintAction.java Thu Oct 3
22:08:27 2013
@@ -19,18 +19,14 @@
*/
package genj.print;
-import genj.util.Resources;
import ancestris.core.actions.AbstractAncestrisAction;
import ancestris.util.swing.DialogManager;
-import genj.util.swing.DialogHelper;
+import genj.util.Resources;
import genj.util.swing.ImageIcon;
-
import java.awt.event.ActionEvent;
import java.util.logging.Level;
import java.util.logging.Logger;
-
import javax.print.PrintException;
-import javax.swing.Action;
import org.openide.DialogDescriptor;
/**
Modified: trunk/AncestrisCore/core/src/genj/renderer/BlueprintEditor.java
==============================================================================
--- trunk/AncestrisCore/core/src/genj/renderer/BlueprintEditor.java
(original)
+++ trunk/AncestrisCore/core/src/genj/renderer/BlueprintEditor.java Thu Oct
3 22:08:27 2013
@@ -19,6 +19,8 @@
*/
package genj.renderer;
+import ancestris.core.actions.AbstractAncestrisAction;
+import ancestris.util.swing.DialogManager;
import genj.common.PathTreeWidget;
import genj.gedcom.Entity;
import genj.gedcom.Gedcom;
@@ -30,10 +32,6 @@
import genj.gedcom.PropertyXRef;
import genj.gedcom.TagPath;
import genj.util.Resources;
-import ancestris.core.actions.AbstractAncestrisAction;
-import ancestris.util.swing.DialogManager;
-import genj.util.swing.DialogHelper;
-
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
@@ -49,7 +47,6 @@
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-
import javax.swing.AbstractButton;
import javax.swing.BorderFactory;
import javax.swing.JButton;
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 22:08:27 2013
@@ -19,21 +19,18 @@
*/
package genj.renderer;
+import ancestris.core.actions.AbstractAncestrisAction;
+import ancestris.util.swing.DialogManager;
import genj.gedcom.Entity;
import genj.gedcom.Gedcom;
import genj.util.Resources;
-import ancestris.core.actions.AbstractAncestrisAction;
-import ancestris.util.swing.DialogManager;
import genj.util.swing.ButtonHelper;
-import genj.util.swing.DialogHelper;
import genj.util.swing.ImageIcon;
import genj.util.swing.NestedBlockLayout;
-
import java.awt.event.ActionEvent;
import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
-
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JPanel;
@@ -41,7 +38,6 @@
import javax.swing.ListSelectionModel;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import org.openide.DialogDescriptor;
/**
* Action for picking/editing a blueprint
Modified: trunk/AncestrisCore/core/src/genj/view/ScreenshotAction.java
==============================================================================
--- trunk/AncestrisCore/core/src/genj/view/ScreenshotAction.java
(original)
+++ trunk/AncestrisCore/core/src/genj/view/ScreenshotAction.java Thu Oct
3 22:08:27 2013
@@ -19,13 +19,11 @@
*/
package genj.view;
-import genj.renderer.RenderSelectionHintKey;
-import genj.util.Resources;
import ancestris.core.actions.AbstractAncestrisAction;
import ancestris.util.swing.DialogManager;
-import genj.util.swing.DialogHelper;
+import genj.renderer.RenderSelectionHintKey;
+import genj.util.Resources;
import genj.util.swing.ImageIcon;
-
import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.Point;
@@ -38,7 +36,6 @@
import java.awt.image.BufferedImage;
import java.util.logging.Level;
import java.util.logging.Logger;
-
import javax.swing.Box;
import javax.swing.BoxLayout;
import javax.swing.ButtonGroup;
Modified: trunk/AncestrisCore/core/src/genj/view/SettingsAction.java
==============================================================================
--- trunk/AncestrisCore/core/src/genj/view/SettingsAction.java (original)
+++ trunk/AncestrisCore/core/src/genj/view/SettingsAction.java Thu Oct 3
22:08:27 2013
@@ -19,13 +19,10 @@
*/
package genj.view;
-import genj.util.Resources;
import ancestris.core.actions.AbstractAncestrisAction;
import ancestris.util.swing.DialogManager;
-import genj.util.swing.DialogHelper;
-
+import genj.util.Resources;
import java.awt.event.ActionEvent;
-
import javax.swing.JComponent;
/**
Modified:
trunk/AncestrisCore/document.view/src/ancestris/modules/document/view/HyperLinkTextDocumentView.java
==============================================================================
---
trunk/AncestrisCore/document.view/src/ancestris/modules/document/view/HyperLinkTextDocumentView.java
(original)
+++
trunk/AncestrisCore/document.view/src/ancestris/modules/document/view/HyperLinkTextDocumentView.java
Thu Oct 3 22:08:27 2013
@@ -16,7 +16,6 @@
import static ancestris.modules.document.view.Bundle.*;
import ancestris.util.swing.DialogManager;
import genj.gedcom.Context;
-import genj.util.swing.DialogHelper;
import java.awt.event.ActionEvent;
import java.io.BufferedReader;
import java.io.File;
Modified:
trunk/AncestrisCore/modules.almanac/src/genj/timeline/TimelineViewSettings.java
==============================================================================
---
trunk/AncestrisCore/modules.almanac/src/genj/timeline/TimelineViewSettings.java
(original)
+++
trunk/AncestrisCore/modules.almanac/src/genj/timeline/TimelineViewSettings.java
Thu Oct 3 22:08:27 2013
@@ -26,16 +26,13 @@
import genj.gedcom.TagPath;
import genj.util.Resources;
import genj.util.swing.ColorsWidget;
-import genj.util.swing.DialogHelper;
import genj.util.swing.ImageIcon;
import genj.util.swing.ListSelectionWidget;
import genj.util.swing.NestedBlockLayout;
-
import java.awt.BorderLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.List;
-
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
Modified: trunk/AncestrisCore/modules.beans/src/genj/edit/beans/ChoiceBean.java
==============================================================================
--- trunk/AncestrisCore/modules.beans/src/genj/edit/beans/ChoiceBean.java
(original)
+++ trunk/AncestrisCore/modules.beans/src/genj/edit/beans/ChoiceBean.java
Thu Oct 3 22:08:27 2013
@@ -19,17 +19,13 @@
*/
package genj.edit.beans;
+import ancestris.util.swing.DialogManager;
import genj.gedcom.Property;
import genj.gedcom.PropertyChoiceValue;
import genj.util.GridBagHelper;
-import ancestris.core.actions.AbstractAncestrisAction;
-import ancestris.util.swing.DialogManager;
import genj.util.swing.ChoiceWidget;
-import genj.util.swing.DialogHelper;
-
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-
import javax.swing.JCheckBox;
import javax.swing.border.EmptyBorder;
import javax.swing.event.ChangeEvent;
Modified: trunk/AncestrisCore/modules.beans/src/genj/edit/beans/MediaBean.java
==============================================================================
--- trunk/AncestrisCore/modules.beans/src/genj/edit/beans/MediaBean.java
(original)
+++ trunk/AncestrisCore/modules.beans/src/genj/edit/beans/MediaBean.java
Thu Oct 3 22:08:27 2013
@@ -19,8 +19,10 @@
*/
package genj.edit.beans;
+import ancestris.core.actions.AbstractAncestrisAction;
import ancestris.core.actions.AncestrisActionProvider;
import ancestris.core.actions.RunExternal;
+import ancestris.util.swing.DialogManager;
import genj.gedcom.Entity;
import genj.gedcom.Gedcom;
import genj.gedcom.GedcomException;
@@ -37,9 +39,6 @@
import genj.util.DefaultValueMap;
import genj.util.Origin;
import genj.util.Resources;
-import ancestris.core.actions.AbstractAncestrisAction;
-import ancestris.util.swing.DialogManager;
-import genj.util.swing.DialogHelper;
import genj.util.swing.FileChooserWidget;
import genj.util.swing.NestedBlockLayout;
import genj.util.swing.TextFieldWidget;
Modified: trunk/AncestrisCore/modules.beans/src/genj/edit/beans/PlaceBean.java
==============================================================================
--- trunk/AncestrisCore/modules.beans/src/genj/edit/beans/PlaceBean.java
(original)
+++ trunk/AncestrisCore/modules.beans/src/genj/edit/beans/PlaceBean.java
Thu Oct 3 22:08:27 2013
@@ -20,14 +20,12 @@
package genj.edit.beans;
import ancestris.core.CoreOptions;
+import ancestris.util.swing.DialogManager;
import genj.gedcom.Gedcom;
import genj.gedcom.Property;
import genj.gedcom.PropertyPlace;
import genj.util.GridBagHelper;
-import ancestris.core.actions.AbstractAncestrisAction;
-import ancestris.util.swing.DialogManager;
import genj.util.swing.ChoiceWidget;
-import genj.util.swing.DialogHelper;
import genj.util.swing.Updateable;
import java.awt.Component;
import java.awt.event.ActionEvent;
Modified:
trunk/AncestrisCore/modules.beans/src/genj/edit/beans/ShortNameBean.java
==============================================================================
--- trunk/AncestrisCore/modules.beans/src/genj/edit/beans/ShortNameBean.java
(original)
+++ trunk/AncestrisCore/modules.beans/src/genj/edit/beans/ShortNameBean.java
Thu Oct 3 22:08:27 2013
@@ -20,19 +20,15 @@
package genj.edit.beans;
import ancestris.core.CoreOptions;
+import ancestris.util.swing.DialogManager;
import genj.gedcom.Gedcom;
import genj.gedcom.Property;
import genj.gedcom.PropertyName;
-import ancestris.core.actions.AbstractAncestrisAction;
-import ancestris.util.swing.DialogManager;
import genj.util.swing.ChoiceWidget;
-import genj.util.swing.DialogHelper;
import genj.util.swing.NestedBlockLayout;
import genj.util.swing.TextFieldWidget;
-
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.border.EmptyBorder;
Modified: trunk/AncestrisCore/modules.beans/src/genj/edit/beans/XRefBean.java
==============================================================================
--- trunk/AncestrisCore/modules.beans/src/genj/edit/beans/XRefBean.java
(original)
+++ trunk/AncestrisCore/modules.beans/src/genj/edit/beans/XRefBean.java Thu Oct
3 22:08:27 2013
@@ -19,7 +19,10 @@
*/
package genj.edit.beans;
+import ancestris.core.actions.AbstractAncestrisAction;
import ancestris.core.actions.AncestrisActionProvider;
+import ancestris.util.swing.DialogManager;
+import ancestris.view.SelectionDispatcher;
import genj.common.SelectEntityWidget;
import genj.gedcom.Entity;
import genj.gedcom.Gedcom;
@@ -28,10 +31,6 @@
import genj.gedcom.Property;
import genj.gedcom.PropertyXRef;
import genj.gedcom.UnitOfWork;
-import ancestris.core.actions.AbstractAncestrisAction;
-import ancestris.util.swing.DialogManager;
-import ancestris.view.SelectionDispatcher;
-import genj.util.swing.DialogHelper;
import genj.view.ViewContext;
import java.awt.BorderLayout;
import java.awt.Dimension;
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 22:08:27 2013
@@ -45,7 +45,6 @@
import genj.util.Registry;
import genj.util.Resources;
import genj.util.WordBuffer;
-import genj.util.swing.DialogHelper;
import genj.util.swing.NestedBlockLayout;
import genj.util.swing.TextAreaWidget;
import genj.view.ViewContext;
Modified:
trunk/AncestrisCore/modules.editors.gedcom/src/genj/edit/actions/AbstractChange.java
==============================================================================
---
trunk/AncestrisCore/modules.editors.gedcom/src/genj/edit/actions/AbstractChange.java
(original)
+++
trunk/AncestrisCore/modules.editors.gedcom/src/genj/edit/actions/AbstractChange.java
Thu Oct 3 22:08:27 2013
@@ -29,7 +29,6 @@
import genj.gedcom.GedcomException;
import genj.gedcom.UnitOfWork;
import genj.util.Resources;
-import genj.util.swing.DialogHelper;
import genj.util.swing.ImageIcon;
import genj.util.swing.NestedBlockLayout;
import genj.util.swing.TextAreaWidget;
Modified:
trunk/AncestrisCore/modules.editors.gedcom/src/genj/edit/actions/EditEvent.java
==============================================================================
---
trunk/AncestrisCore/modules.editors.gedcom/src/genj/edit/actions/EditEvent.java
(original)
+++
trunk/AncestrisCore/modules.editors.gedcom/src/genj/edit/actions/EditEvent.java
Thu Oct 3 22:08:27 2013
@@ -19,19 +19,16 @@
*/
package genj.edit.actions;
-import genj.edit.BeanPanel;
+import ancestris.core.actions.AbstractAncestrisAction;
import ancestris.core.resources.Images;
+import ancestris.util.swing.DialogManager;
+import genj.edit.BeanPanel;
import genj.gedcom.Gedcom;
import genj.gedcom.GedcomException;
import genj.gedcom.Property;
import genj.gedcom.UnitOfWork;
import genj.util.Resources;
-import ancestris.core.actions.AbstractAncestrisAction;
-import ancestris.util.swing.DialogManager;
-import genj.util.swing.DialogHelper;
-
import java.awt.event.ActionEvent;
-
import javax.swing.Action;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
Modified:
trunk/AncestrisCore/modules.editors.gedcom/src/genj/edit/actions/TogglePrivate.java
==============================================================================
---
trunk/AncestrisCore/modules.editors.gedcom/src/genj/edit/actions/TogglePrivate.java
(original)
+++
trunk/AncestrisCore/modules.editors.gedcom/src/genj/edit/actions/TogglePrivate.java
Thu Oct 3 22:08:27 2013
@@ -21,15 +21,12 @@
*/
package genj.edit.actions;
+import ancestris.util.swing.DialogManager;
import genj.gedcom.Context;
import genj.gedcom.Gedcom;
import genj.gedcom.GedcomException;
import genj.gedcom.MetaProperty;
import genj.gedcom.Property;
-import ancestris.core.actions.AbstractAncestrisAction;
-import ancestris.util.swing.DialogManager;
-import genj.util.swing.DialogHelper;
-
import java.awt.event.ActionEvent;
import java.util.Collection;
import org.openide.awt.ActionID;
Modified: trunk/AncestrisCore/modules.views.tree/src/genj/tree/TreeView.java
==============================================================================
--- trunk/AncestrisCore/modules.views.tree/src/genj/tree/TreeView.java
(original)
+++ trunk/AncestrisCore/modules.views.tree/src/genj/tree/TreeView.java Thu Oct
3 22:08:27 2013
@@ -53,7 +53,6 @@
import genj.util.Registry;
import genj.util.Resources;
import genj.util.swing.ButtonHelper;
-import genj.util.swing.DialogHelper;
import genj.util.swing.ImageIcon;
import genj.util.swing.PopupWidget;
import genj.util.swing.ScrollPaneWidget;
@@ -66,7 +65,6 @@
import genj.view.ToolBar;
import genj.view.View;
import genj.view.ViewContext;
-import java.awt.AWTEvent;
import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
@@ -1246,9 +1244,9 @@
// let the user choose an individual
SelectEntityWidget select = new
SelectEntityWidget(context.getGedcom(), Gedcom.INDI, null);
- Object rc = DialogManager.create(getText(), select)
+ Object rc = DialogManager.create(getText(), new JComponent[]
{select})
.setOptionType(DialogManager.OK_CANCEL_OPTION)
-// .setDialogId("select.root")
+ .setDialogId("select.root")
.show();
if (rc == DialogManager.OK_OPTION) {
setRoot(select.getSelection());
Modified:
trunk/AncestrisExtensions/CommonAncestor/src/ancestris/modules/commonAncestor/PreviewView.java
==============================================================================
---
trunk/AncestrisExtensions/CommonAncestor/src/ancestris/modules/commonAncestor/PreviewView.java
(original)
+++
trunk/AncestrisExtensions/CommonAncestor/src/ancestris/modules/commonAncestor/PreviewView.java
Thu Oct 3 22:08:27 2013
@@ -1,5 +1,9 @@
package ancestris.modules.commonAncestor;
+import ancestris.core.actions.AbstractAncestrisAction;
+import ancestris.modules.commonAncestor.graphics.IGraphicsRenderer;
+import ancestris.util.swing.DialogManager;
+import ancestris.view.SelectionDispatcher;
import genj.fo.Format;
import genj.fo.FormatOptionsWidget;
import genj.gedcom.Context;
@@ -7,20 +11,21 @@
import genj.gedcom.Gedcom;
import genj.report.ReportView;
import genj.util.Registry;
-import ancestris.core.actions.AbstractAncestrisAction;
-import genj.util.swing.DialogHelper;
import genj.util.swing.EditorHyperlinkSupport;
import genj.util.swing.ImageIcon;
import genj.util.swing.SliderWidget;
import genj.view.ToolBar;
import java.awt.CardLayout;
+import java.awt.Cursor;
import java.awt.Desktop;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.Point;
import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionAdapter;
import java.awt.event.MouseMotionListener;
import java.io.CharArrayWriter;
import java.io.File;
@@ -32,20 +37,13 @@
import javax.swing.Action;
import javax.swing.JComponent;
import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollBar;
import javax.swing.JScrollPane;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.text.BadLocationException;
-
-import ancestris.modules.commonAncestor.graphics.IGraphicsRenderer;
-import ancestris.util.swing.DialogManager;
-import ancestris.view.SelectionDispatcher;
-import java.awt.Cursor;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseMotionAdapter;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollBar;
import org.openide.util.NbBundle;
/**
Modified:
trunk/AncestrisExtensions/CommonAncestor/src/ancestris/modules/commonAncestor/SamePanel.java
==============================================================================
---
trunk/AncestrisExtensions/CommonAncestor/src/ancestris/modules/commonAncestor/SamePanel.java
(original)
+++
trunk/AncestrisExtensions/CommonAncestor/src/ancestris/modules/commonAncestor/SamePanel.java
Thu Oct 3 22:08:27 2013
@@ -5,18 +5,17 @@
*/
package ancestris.modules.commonAncestor;
+import ancestris.core.actions.AbstractAncestrisAction;
+import
ancestris.modules.commonAncestor.quicksearch.module.AbstractQuickSearchComboBar;
+import ancestris.modules.commonAncestor.quicksearch.module.QuickSearchComboBar;
+import ancestris.modules.commonAncestor.quicksearch.module.QuickSearchPopup;
+import ancestris.util.swing.DialogManager;
import genj.gedcom.Context;
import genj.gedcom.Entity;
import genj.gedcom.Fam;
import genj.gedcom.Indi;
import genj.util.EnvironmentChecker;
import genj.util.Registry;
-import ancestris.core.actions.AbstractAncestrisAction;
-import genj.util.swing.DialogHelper;
-import
ancestris.modules.commonAncestor.quicksearch.module.AbstractQuickSearchComboBar;
-import ancestris.modules.commonAncestor.quicksearch.module.QuickSearchComboBar;
-import ancestris.modules.commonAncestor.quicksearch.module.QuickSearchPopup;
-import ancestris.util.swing.DialogManager;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
Modified:
trunk/AncestrisExtensions/gedcom.mergefile/src/ancestris/modules/gedcom/mergefile/GedcomMergeVisualPanel4.java
==============================================================================
---
trunk/AncestrisExtensions/gedcom.mergefile/src/ancestris/modules/gedcom/mergefile/GedcomMergeVisualPanel4.java
(original)
+++
trunk/AncestrisExtensions/gedcom.mergefile/src/ancestris/modules/gedcom/mergefile/GedcomMergeVisualPanel4.java
Thu Oct 3 22:08:27 2013
@@ -1,10 +1,8 @@
package ancestris.modules.gedcom.mergefile;
-import ancestris.core.actions.AbstractAncestrisAction;
import ancestris.gedcom.GedcomDirectory;
import static ancestris.modules.gedcom.mergefile.Bundle.*;
import ancestris.util.swing.DialogManager;
-import genj.util.swing.DialogHelper;
import java.io.File;
import javax.swing.JPanel;
import org.openide.util.NbBundle;
Modified:
trunk/AncestrisExtensions/releve/src/ancestris/modules/releve/ReleveTopComponent.java
==============================================================================
---
trunk/AncestrisExtensions/releve/src/ancestris/modules/releve/ReleveTopComponent.java
(original)
+++
trunk/AncestrisExtensions/releve/src/ancestris/modules/releve/ReleveTopComponent.java
Thu Oct 3 22:08:27 2013
@@ -1,31 +1,29 @@
package ancestris.modules.releve;
import ancestris.core.actions.AbstractAncestrisAction;
-import ancestris.modules.views.tree.TreeTopComponent;
-import ancestris.modules.releve.file.FileManager;
-import ancestris.modules.releve.file.ReleveFileExport;
-import ancestris.modules.releve.file.ReleveFileDialog;
-import ancestris.modules.releve.model.ModelAbstract;
-import ancestris.modules.releve.editor.StandaloneEditor;
-import ancestris.view.AncestrisDockModes;
import ancestris.core.pluginservice.AncestrisPlugin;
-import ancestris.gedcom.GedcomDirectory;
import ancestris.modules.releve.dnd.TreeViewDropTarget;
+import ancestris.modules.releve.editor.StandaloneEditor;
import ancestris.modules.releve.file.FileBuffer;
+import ancestris.modules.releve.file.FileManager;
import ancestris.modules.releve.file.ReleveFileAncestrisV2;
+import ancestris.modules.releve.file.ReleveFileDialog;
+import ancestris.modules.releve.file.ReleveFileExport;
import ancestris.modules.releve.file.ReleveFileGedcom;
-import ancestris.modules.releve.model.Field;
import ancestris.modules.releve.model.DataManager;
+import ancestris.modules.releve.model.Field;
+import ancestris.modules.releve.model.ModelAbstract;
import ancestris.modules.releve.model.Record;
import ancestris.modules.releve.model.RecordBirth;
import ancestris.modules.releve.model.RecordDeath;
import ancestris.modules.releve.model.RecordMarriage;
import ancestris.modules.releve.model.RecordMisc;
+import ancestris.modules.views.tree.TreeTopComponent;
import ancestris.util.swing.DialogManager;
+import ancestris.view.AncestrisDockModes;
import genj.gedcom.Context;
import genj.tree.TreeView;
import genj.util.EnvironmentChecker;
-import genj.util.swing.DialogHelper;
import java.awt.Component;
import java.awt.GridBagConstraints;
import java.awt.Toolkit;
@@ -42,7 +40,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-import javax.swing.filechooser.FileFilter;
import javax.swing.AbstractAction;
import javax.swing.Icon;
import javax.swing.ImageIcon;
@@ -53,6 +50,7 @@
import javax.swing.JPopupMenu;
import javax.swing.KeyStroke;
import javax.swing.SwingUtilities;
+import javax.swing.filechooser.FileFilter;
import org.netbeans.api.javahelp.Help;
import org.netbeans.api.options.OptionsDisplayer;
import org.openide.util.*;
---------------------------------------------------------------------
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]
