diff --git a/src/Map/MapParametersDialog.java b/src/Map/MapParametersDialog.java index ec6a5d15..03d77300 100644 --- a/src/Map/MapParametersDialog.java +++ b/src/Map/MapParametersDialog.java @@ -63,7 +63,7 @@ public class MapParametersDialog extends PamDialog { private JCheckBox headingUp = new JCheckBox("Ship heading always up"); - private JCheckBox showSurface = new JCheckBox("Show sea sueface"); + private JCheckBox showSurface = new JCheckBox("Show sea surface"); private MapFileManager mapFileManager; @@ -261,7 +261,7 @@ public class MapParametersDialog extends PamDialog { public HydrophonePanel() { super(); - setBorder(new TitledBorder("Hydropone Options")); + setBorder(new TitledBorder("Hydrophone Options")); setLayout(new GridBagLayout()); GridBagConstraints c = new PamGridBagContraints(); c.gridx = 0; @@ -272,7 +272,7 @@ public class MapParametersDialog extends PamDialog { addComponent(this, colourByChannel, c); c.gridy++; c.gridwidth = 1; - addComponent(this, new JLabel("Symbox size ", JLabel.RIGHT), c); + addComponent(this, new JLabel("Symbol size ", JLabel.RIGHT), c); c.gridx++; symbolSize = new SpinnerNumberModel(Hydrophone.DefaultSymbolSize, 4, 30, 2); addComponent(this, symbolSizeSpinner = new JSpinner(symbolSize), c); diff --git a/src/PamController/SettingsFileDialog.java b/src/PamController/SettingsFileDialog.java index 8619b8f6..73fab149 100644 --- a/src/PamController/SettingsFileDialog.java +++ b/src/PamController/SettingsFileDialog.java @@ -63,6 +63,7 @@ public class SettingsFileDialog extends PamDialog { pan.add(BorderLayout.CENTER, p); pan.add(BorderLayout.SOUTH, q); + setMoveToMouse(false); setDialogComponent(pan); } diff --git a/src/PamView/PamObjectViewer.java b/src/PamView/PamObjectViewer.java index 8a2c36be..2801162b 100644 --- a/src/PamView/PamObjectViewer.java +++ b/src/PamView/PamObjectViewer.java @@ -37,6 +37,7 @@ import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.JScrollPane; import javax.swing.JTextField; +import javax.swing.SwingUtilities; import javax.swing.Timer; import javax.swing.WindowConstants; @@ -882,6 +883,7 @@ public class PamObjectViewer implements PamViewInterface, ComponentListener, blockTimer.start(); setVisible(true); + } @@ -1005,6 +1007,22 @@ public class PamObjectViewer implements PamViewInterface, ComponentListener, return null; } + @Override + public void setVisible(boolean vis) { + if (vis) { + SwingUtilities.invokeLater(new Runnable() { + /** + * This seems to work and resize the text fields on high def displays. + */ + @Override + public void run() { + pack(); + } + }); + } + super.setVisible(vis); + } + void fillPanelContent() { p.removeAll(); GridBagLayout layout = new GridBagLayout(); diff --git a/src/PamView/dialog/PamDialog.java b/src/PamView/dialog/PamDialog.java index e3c94234..64e7b5f1 100644 --- a/src/PamView/dialog/PamDialog.java +++ b/src/PamView/dialog/PamDialog.java @@ -64,6 +64,10 @@ abstract public class PamDialog extends JDialog { private boolean warnDefaultSetting = true; private CancelObserver cancelObserver; private boolean firstShowing = true; +/* + * Move to mouse position is parent is null + */ + private boolean moveToMouse = true; public JPanel getButtonPanel() { return buttonPanel; @@ -281,7 +285,7 @@ abstract public class PamDialog extends JDialog { synchronized (this) { PamColors.getInstance().notifyContianer(this.getContentPane()); } - if (getOwner() == null) { + if (getOwner() == null && isMoveToMouse()) { moveToMouseLocation(); } if (firstShowing) { @@ -691,4 +695,18 @@ abstract public class PamDialog extends JDialog { } } + /** + * @return the moveToMouse + */ + public boolean isMoveToMouse() { + return moveToMouse; + } + + /** + * @param moveToMouse the moveToMouse to set + */ + public void setMoveToMouse(boolean moveToMouse) { + this.moveToMouse = moveToMouse; + } + } diff --git a/src/generalDatabase/DBSchemaWriter.java b/src/generalDatabase/DBSchemaWriter.java index 746516b4..f602ad5c 100644 --- a/src/generalDatabase/DBSchemaWriter.java +++ b/src/generalDatabase/DBSchemaWriter.java @@ -6,8 +6,6 @@ import java.sql.Types; import java.util.ArrayList; import java.util.List; -import javax.xml.parsers.DocumentBuilderFactory; - import org.w3c.dom.Document; import org.w3c.dom.Element;