Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 16074) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 16075) @@ -16,8 +16,8 @@ import org.openstreetmap.josm.gui.util.GuiHelper; -import org.openstreetmap.josm.gui.widgets.JMultilineLabel; import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel; import org.openstreetmap.josm.io.ChangesetQuery; import org.openstreetmap.josm.spi.preferences.Config; +import org.openstreetmap.josm.tools.GBC; /** @@ -27,8 +27,8 @@ public class AdvancedChangesetQueryPanel extends JPanel { - private final JCheckBox cbUserRestriction = new JCheckBox(); - private final JCheckBox cbOpenAndCloseRestrictions = new JCheckBox(); - private final JCheckBox cbTimeRestrictions = new JCheckBox(); - private final JCheckBox cbBoundingBoxRestriction = new JCheckBox(); + private final JCheckBox cbUserRestriction = new JCheckBox(tr("Select changesets owned by specific users")); + private final JCheckBox cbOpenAndCloseRestrictions = new JCheckBox(tr("Select changesets depending on whether they are open or closed")); + private final JCheckBox cbTimeRestrictions = new JCheckBox(tr("Select changesets based on the date/time they have been created or closed")); + private final JCheckBox cbBoundingBoxRestriction = new JCheckBox(tr("Select only changesets related to a specific bounding box")); private final UserRestrictionPanel pnlUserRestriction = new UserRestrictionPanel(); private final OpenAndCloseStateRestrictionPanel pnlOpenAndCloseRestriction = new OpenAndCloseStateRestrictionPanel(); @@ -47,59 +47,22 @@ JPanel pnl = new VerticallyScrollablePanel(new GridBagLayout()); pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); - GridBagConstraints gc = new GridBagConstraints(); + GridBagConstraints gc = GBC.eol().fill(GridBagConstraints.HORIZONTAL); // -- select changesets by a specific user // - gc.anchor = GridBagConstraints.NORTHWEST; - gc.weightx = 0.0; - gc.fill = GridBagConstraints.HORIZONTAL; pnl.add(cbUserRestriction, gc); cbUserRestriction.addItemListener(stateChangeHandler); - - gc.gridx = 1; - gc.weightx = 1.0; - pnl.add(new JMultilineLabel(tr("Select changesets owned by specific users")), gc); - - gc.gridy = 1; - gc.gridx = 1; - gc.weightx = 1.0; pnl.add(pnlUserRestriction, gc); // -- restricting the query to open and closed changesets // - gc.gridy = 2; - gc.gridx = 0; - gc.anchor = GridBagConstraints.NORTHWEST; - gc.weightx = 0.0; - gc.fill = GridBagConstraints.HORIZONTAL; pnl.add(cbOpenAndCloseRestrictions, gc); cbOpenAndCloseRestrictions.addItemListener(stateChangeHandler); - - gc.gridx = 1; - gc.weightx = 1.0; - pnl.add(new JMultilineLabel(tr("Select changesets depending on whether they are open or closed")), gc); - - gc.gridy = 3; - gc.gridx = 1; - gc.weightx = 1.0; pnl.add(pnlOpenAndCloseRestriction, gc); // -- restricting the query to a specific time // - gc.gridy = 4; - gc.gridx = 0; - gc.anchor = GridBagConstraints.NORTHWEST; - gc.weightx = 0.0; - gc.fill = GridBagConstraints.HORIZONTAL; pnl.add(cbTimeRestrictions, gc); cbTimeRestrictions.addItemListener(stateChangeHandler); - - gc.gridx = 1; - gc.weightx = 1.0; - pnl.add(new JMultilineLabel(tr("Select changesets based on the date/time they have been created or closed")), gc); - - gc.gridy = 5; - gc.gridx = 1; - gc.weightx = 1.0; pnl.add(pnlTimeRestriction, gc); @@ -107,28 +70,8 @@ // -- restricting the query to a specific bounding box // - gc.gridy = 6; - gc.gridx = 0; - gc.anchor = GridBagConstraints.NORTHWEST; - gc.weightx = 0.0; - gc.fill = GridBagConstraints.HORIZONTAL; pnl.add(cbBoundingBoxRestriction, gc); cbBoundingBoxRestriction.addItemListener(stateChangeHandler); - - gc.gridx = 1; - gc.weightx = 1.0; - pnl.add(new JMultilineLabel(tr("Select only changesets related to a specific bounding box")), gc); - - gc.gridy = 7; - gc.gridx = 1; - gc.weightx = 1.0; pnl.add(pnlBoundingBoxRestriction, gc); - - gc.gridy = 8; - gc.gridx = 0; - gc.gridwidth = 2; - gc.fill = GridBagConstraints.BOTH; - gc.weightx = 1.0; - gc.weighty = 1.0; pnl.add(new JPanel(), gc); @@ -231,24 +174,16 @@ class RestrictionGroupStateChangeHandler implements ItemListener { protected void userRestrictionStateChanged() { - if (pnlUserRestriction == null) - return; pnlUserRestriction.setVisible(cbUserRestriction.isSelected()); } protected void openCloseRestrictionStateChanged() { - if (pnlOpenAndCloseRestriction == null) - return; pnlOpenAndCloseRestriction.setVisible(cbOpenAndCloseRestrictions.isSelected()); } protected void timeRestrictionsStateChanged() { - if (pnlTimeRestriction == null) - return; pnlTimeRestriction.setVisible(cbTimeRestrictions.isSelected()); } protected void boundingBoxRestrictionChanged() { - if (pnlBoundingBoxRestriction == null) - return; pnlBoundingBoxRestriction.setVisible(cbBoundingBoxRestriction.isSelected()); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (revision 16074) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (revision 16075) @@ -10,6 +10,4 @@ import java.awt.event.ItemEvent; import java.awt.event.ItemListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; import java.util.EnumMap; import java.util.Map; @@ -26,7 +24,7 @@ import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.gui.widgets.HtmlPanel; -import org.openstreetmap.josm.gui.widgets.JMultilineLabel; import org.openstreetmap.josm.io.ChangesetQuery; import org.openstreetmap.josm.spi.preferences.Config; +import org.openstreetmap.josm.tools.GBC; import org.openstreetmap.josm.tools.Logging; @@ -47,5 +45,4 @@ private transient Map rbQueries; - private transient Map lblQueries; private JCheckBox cbMyChangesetsOnly; @@ -55,5 +52,4 @@ ButtonGroup bgQueries = new ButtonGroup(); rbQueries = new EnumMap<>(BasicQuery.class); - lblQueries = new EnumMap<>(BasicQuery.class); SelectQueryHandler selectedQueryHandler = new SelectQueryHandler(); for (BasicQuery q: BasicQuery.values()) { @@ -62,59 +58,19 @@ rbQueries.put(q, rb); bgQueries.add(rb); - JMultilineLabel lbl = new JMultilineLabel(""); - lbl.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - if (rb.isEnabled()) { - rb.setSelected(true); - } - } - }); - lblQueries.put(q, lbl); - } - - GridBagConstraints gc = new GridBagConstraints(); + } + + GridBagConstraints gc = GBC.eop().fill(GridBagConstraints.HORIZONTAL); // -- most recent changes - gc.fill = GridBagConstraints.NONE; - gc.anchor = GridBagConstraints.NORTHWEST; - gc.insets = new Insets(0, 0, 5, 3); pnl.add(rbQueries.get(BasicQuery.MOST_RECENT_CHANGESETS), gc); - gc.gridx = 1; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 1.0; - pnl.add(lblQueries.get(BasicQuery.MOST_RECENT_CHANGESETS), gc); - // -- most recent changes - gc.gridx = 0; - gc.gridy = 1; - gc.fill = GridBagConstraints.NONE; - gc.weightx = 0.0; pnl.add(rbQueries.get(BasicQuery.MY_OPEN_CHANGESETS), gc); - gc.gridx = 1; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 1.0; - pnl.add(lblQueries.get(BasicQuery.MY_OPEN_CHANGESETS), gc); - // -- changesets in map view - gc.gridx = 0; - gc.gridy = 2; - gc.fill = GridBagConstraints.NONE; - gc.weightx = 0.0; pnl.add(rbQueries.get(BasicQuery.CHANGESETS_IN_MAP_VIEW), gc); - gc.gridx = 1; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 1.0; - pnl.add(lblQueries.get(BasicQuery.CHANGESETS_IN_MAP_VIEW), gc); - // -- checkbox my changesets only - gc.gridx = 0; - gc.gridy = 3; gc.gridwidth = 2; gc.insets = new Insets(5, 0, 3, 3); - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 1.0; cbMyChangesetsOnly = new JCheckBox(tr("Download my changesets only")); pnl.add(cbMyChangesetsOnly, gc); @@ -123,12 +79,5 @@ // grab remaining space - gc.gridx = 0; - gc.gridy = 4; - gc.gridwidth = 2; - gc.insets = new Insets(5, 0, 3, 3); - gc.fill = GridBagConstraints.BOTH; - gc.weightx = 1.0; - gc.weighty = 1.0; - pnl.add(new JPanel(), gc); + pnl.add(new JPanel(), GBC.eol().insets(5, 0, 3, 3).fill()); return pnl; @@ -163,10 +112,10 @@ */ public void init() { - JMultilineLabel lbl = lblQueries.get(BasicQuery.MOST_RECENT_CHANGESETS); + JRadioButton lbl = rbQueries.get(BasicQuery.MOST_RECENT_CHANGESETS); lbl.setText(tr("Download the latest changesets")); // query for open changesets only possible if we have a current user which is at least // partially identified - lbl = lblQueries.get(BasicQuery.MY_OPEN_CHANGESETS); + lbl = rbQueries.get(BasicQuery.MY_OPEN_CHANGESETS); if (UserIdentityManager.getInstance().isAnonymous()) { rbQueries.get(BasicQuery.MY_OPEN_CHANGESETS).setEnabled(false); @@ -179,5 +128,5 @@ // query for changesets in the current map view only if there *is* a current map view - lbl = lblQueries.get(BasicQuery.CHANGESETS_IN_MAP_VIEW); + lbl = rbQueries.get(BasicQuery.CHANGESETS_IN_MAP_VIEW); if (!MainApplication.isDisplayingMapView()) { rbQueries.get(BasicQuery.CHANGESETS_IN_MAP_VIEW).setEnabled(false); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java (revision 16074) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java (revision 16075) @@ -154,5 +154,5 @@ WindowGeometry.centerInWindow( getParent(), - new Dimension(400, 400) + new Dimension(600, 400) ) ).applySafe(this); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/OpenAndCloseStateRestrictionPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/OpenAndCloseStateRestrictionPanel.java (revision 16074) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/OpenAndCloseStateRestrictionPanel.java (revision 16075) @@ -13,7 +13,7 @@ import javax.swing.JRadioButton; -import org.openstreetmap.josm.gui.widgets.JMultilineLabel; import org.openstreetmap.josm.io.ChangesetQuery; import org.openstreetmap.josm.spi.preferences.Config; +import org.openstreetmap.josm.tools.GBC; /** @@ -27,7 +27,7 @@ private static final String PREF_QUERY_TYPE = PREF_ROOT + ".query-type"; - private final JRadioButton rbOpenOnly = new JRadioButton(); - private final JRadioButton rbClosedOnly = new JRadioButton(); - private final JRadioButton rbBoth = new JRadioButton(); + private final JRadioButton rbOpenOnly = new JRadioButton(tr("Query open changesets only")); + private final JRadioButton rbClosedOnly = new JRadioButton(tr("Query closed changesets only")); + private final JRadioButton rbBoth = new JRadioButton(tr("Query both open and closed changesets")); /** @@ -47,31 +47,8 @@ ) )); - GridBagConstraints gc = new GridBagConstraints(); - gc.anchor = GridBagConstraints.NORTHWEST; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 0.0; + GridBagConstraints gc = GBC.eol().fill(GridBagConstraints.HORIZONTAL); add(rbOpenOnly, gc); - - gc.gridx = 1; - gc.weightx = 1.0; - add(new JMultilineLabel(tr("Query open changesets only")), gc); - - gc.gridy = 1; - gc.gridx = 0; - gc.weightx = 0.0; add(rbClosedOnly, gc); - - gc.gridx = 1; - gc.weightx = 1.0; - add(new JMultilineLabel(tr("Query closed changesets only")), gc); - - gc.gridy = 2; - gc.gridx = 0; - gc.weightx = 0.0; add(rbBoth, gc); - - gc.gridx = 1; - gc.weightx = 1.0; - add(new JMultilineLabel(tr("Query both open and closed changesets")), gc); ButtonGroup bgRestrictions = new ButtonGroup(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/TimeRestrictionPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/TimeRestrictionPanel.java (revision 16074) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/TimeRestrictionPanel.java (revision 16075) @@ -24,9 +24,9 @@ import org.openstreetmap.josm.gui.HelpAwareOptionPane; import org.openstreetmap.josm.gui.help.HelpUtil; -import org.openstreetmap.josm.gui.widgets.JMultilineLabel; import org.openstreetmap.josm.gui.widgets.JosmTextField; import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator; import org.openstreetmap.josm.io.ChangesetQuery; import org.openstreetmap.josm.spi.preferences.Config; +import org.openstreetmap.josm.tools.GBC; /** @@ -36,6 +36,8 @@ public class TimeRestrictionPanel extends JPanel implements RestrictionPanel { - private final JRadioButton rbClosedAfter = new JRadioButton(); - private final JRadioButton rbClosedAfterAndCreatedBefore = new JRadioButton(); + private final JRadioButton rbClosedAfter = new JRadioButton( + tr("Only changesets closed after the following date/time")); + private final JRadioButton rbClosedAfterAndCreatedBefore = new JRadioButton( + tr("Only changesets closed after and created before a specific date/time")); private final JosmTextField tfClosedAfterDate1 = new JosmTextField(); private transient DateValidator valClosedAfterDate1; @@ -163,41 +165,11 @@ // -- changesets closed after a specific date/time // - GridBagConstraints gc = new GridBagConstraints(); - gc.anchor = GridBagConstraints.NORTHWEST; - gc.gridx = 0; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 0.0; + GridBagConstraints gc = GBC.eol().fill(GridBagConstraints.HORIZONTAL); add(rbClosedAfter, gc); - - gc.gridx = 1; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 1.0; - add(new JMultilineLabel(tr("Only changesets closed after the following date/time")), gc); - - gc.gridx = 1; - gc.gridy = 1; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 1.0; add(buildClosedAfterInputPanel(), gc); // -- changesets closed after a specific date/time and created before a specific date time // - gc = new GridBagConstraints(); - gc.anchor = GridBagConstraints.NORTHWEST; - gc.gridy = 2; - gc.gridx = 0; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 0.0; add(rbClosedAfterAndCreatedBefore, gc); - - gc.gridx = 1; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 1.0; - add(new JMultilineLabel(tr("Only changesets closed after and created before a specific date/time")), gc); - - gc.gridx = 1; - gc.gridy = 3; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 1.0; add(buildClosedAfterAndCreatedBeforeInputPanel(), gc); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UserRestrictionPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UserRestrictionPanel.java (revision 16074) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UserRestrictionPanel.java (revision 16075) @@ -7,5 +7,4 @@ import java.awt.GridBagConstraints; import java.awt.GridBagLayout; -import java.awt.Insets; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -22,5 +21,4 @@ import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.preferences.server.UserNameValidator; -import org.openstreetmap.josm.gui.widgets.JMultilineLabel; import org.openstreetmap.josm.gui.widgets.JosmTextField; import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator; @@ -28,4 +26,5 @@ import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.tools.CheckParameterUtil; +import org.openstreetmap.josm.tools.GBC; /** @@ -38,12 +37,11 @@ private final ButtonGroup bgUserRestrictions = new ButtonGroup(); - private final JRadioButton rbRestrictToMyself = new JRadioButton(); - private final JRadioButton rbRestrictToUid = new JRadioButton(); - private final JRadioButton rbRestrictToUserName = new JRadioButton(); + private final JRadioButton rbRestrictToMyself = new JRadioButton(); // text is set in #startUserInput + private final JRadioButton rbRestrictToUid = new JRadioButton(tr("Only changesets owned by the user with the following user ID")); + private final JRadioButton rbRestrictToUserName = new JRadioButton(tr("Only changesets owned by the user with the following user name")); private final JosmTextField tfUid = new JosmTextField(10); private transient UidInputFieldValidator valUid; private final JosmTextField tfUserName = new JosmTextField(10); private transient UserNameValidator valUserName; - private final JMultilineLabel lblRestrictedToMyself = new JMultilineLabel(tr("Only changesets owned by myself")); /** @@ -56,19 +54,10 @@ protected JPanel buildUidInputPanel() { JPanel pnl = new JPanel(new GridBagLayout()); - GridBagConstraints gc = new GridBagConstraints(); - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 0.0; - gc.insets = new Insets(0, 0, 0, 3); - pnl.add(new JLabel(tr("User ID:")), gc); - - gc.gridx = 1; - pnl.add(tfUid, gc); + pnl.add(new JLabel(tr("User ID:")), GBC.std()); + + pnl.add(tfUid, GBC.eol().fill(GridBagConstraints.HORIZONTAL)); SelectAllOnFocusGainedDecorator.decorate(tfUid); valUid = UidInputFieldValidator.decorate(tfUid); - // grab remaining space - gc.gridx = 2; - gc.weightx = 1.0; - pnl.add(new JPanel(), gc); return pnl; } @@ -76,19 +65,10 @@ protected JPanel buildUserNameInputPanel() { JPanel pnl = new JPanel(new GridBagLayout()); - GridBagConstraints gc = new GridBagConstraints(); - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 0.0; - gc.insets = new Insets(0, 0, 0, 3); - pnl.add(new JLabel(tr("User name:")), gc); - - gc.gridx = 1; - pnl.add(tfUserName, gc); + pnl.add(new JLabel(tr("User name:")), GBC.std()); + + pnl.add(tfUserName, GBC.eol().fill(GridBagConstraints.HORIZONTAL)); SelectAllOnFocusGainedDecorator.decorate(tfUserName); valUserName = new UserNameValidator(tfUserName); - // grab remaining space - gc.gridx = 2; - gc.weightx = 1.0; - pnl.add(new JPanel(), gc); return pnl; } @@ -105,51 +85,16 @@ ItemListener userRestrictionChangeHandler = new UserRestrictionChangedHandler(); - GridBagConstraints gc = new GridBagConstraints(); - gc.anchor = GridBagConstraints.NORTHWEST; - gc.gridx = 0; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 0.0; + GridBagConstraints gc = GBC.eol().fill(GridBagConstraints.HORIZONTAL); + add(rbRestrictToMyself, gc); rbRestrictToMyself.addItemListener(userRestrictionChangeHandler); - gc.gridx = 1; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 1.0; - add(lblRestrictedToMyself, gc); - - gc.gridx = 0; - gc.gridy = 1; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 0.0; add(rbRestrictToUid, gc); rbRestrictToUid.addItemListener(userRestrictionChangeHandler); - - gc.gridx = 1; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 1.0; - add(new JMultilineLabel(tr("Only changesets owned by the user with the following user ID")), gc); - - gc.gridx = 1; - gc.gridy = 2; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 1.0; add(buildUidInputPanel(), gc); - gc.gridx = 0; - gc.gridy = 3; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 0.0; add(rbRestrictToUserName, gc); rbRestrictToUserName.addItemListener(userRestrictionChangeHandler); - gc.gridx = 1; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 1.0; - add(new JMultilineLabel(tr("Only changesets owned by the user with the following user name")), gc); - - gc.gridx = 1; - gc.gridy = 4; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 1.0; add(buildUserNameInputPanel(), gc); @@ -164,5 +109,5 @@ public void startUserInput() { if (UserIdentityManager.getInstance().isAnonymous()) { - lblRestrictedToMyself.setText(tr("Only changesets owned by myself (disabled. JOSM is currently run by an anonymous user)")); + rbRestrictToMyself.setText(tr("Only changesets owned by myself (disabled. JOSM is currently run by an anonymous user)")); rbRestrictToMyself.setEnabled(false); if (rbRestrictToMyself.isSelected()) { @@ -170,5 +115,5 @@ } } else { - lblRestrictedToMyself.setText(tr("Only changesets owned by myself")); + rbRestrictToMyself.setText(tr("Only changesets owned by myself")); rbRestrictToMyself.setEnabled(true); rbRestrictToMyself.setSelected(true);