Changeset 10043 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2016-03-26T14:45:25+01:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/MainApplication.java
r9995 r10043 4 4 import static org.openstreetmap.josm.tools.I18n.tr; 5 5 import static org.openstreetmap.josm.tools.I18n.trn; 6 import gnu.getopt.Getopt;7 import gnu.getopt.LongOpt;8 6 9 7 import java.awt.Dimension; … … 75 73 import org.openstreetmap.josm.tools.PlatformHookWindows; 76 74 import org.openstreetmap.josm.tools.Utils; 75 76 import gnu.getopt.Getopt; 77 import gnu.getopt.LongOpt; 77 78 78 79 /** … … 651 652 } 652 653 653 private boolean handleNetworkOrProxyErrors(boolean hasErrors, String title, String message) {654 private static boolean handleNetworkOrProxyErrors(boolean hasErrors, String title, String message) { 654 655 if (hasErrors) { 655 656 ExtendedDialog ed = new ExtendedDialog( -
trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
r10035 r10043 446 446 } 447 447 448 private void destroyComponents(Component component, boolean destroyItself) {448 private static void destroyComponents(Component component, boolean destroyItself) { 449 449 if (component instanceof Container) { 450 450 for (Component c: ((Container) component).getComponents()) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java
r9149 r10043 31 31 private final Collection<TableCellRenderer> customRenderer = new CopyOnWriteArrayList<>(); 32 32 33 private void setColors(Component c, String key, boolean isSelected) {33 private static void setColors(Component c, String key, boolean isSelected) { 34 34 UIDefaults defaults = javax.swing.UIManager.getDefaults(); 35 35 if (OsmPrimitive.getDiscardableKeys().contains(key)) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
r9970 r10043 566 566 } 567 567 568 private int findViewRow(JTable table, TableModel model, Object value) {568 private static int findViewRow(JTable table, TableModel model, Object value) { 569 569 for (int i = 0; i < model.getRowCount(); i++) { 570 570 if (model.getValueAt(i, 0).equals(value)) -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
r9246 r10043 280 280 } 281 281 282 private Integer findAdjacentWay(NodesWays nw, Node n) {282 private static Integer findAdjacentWay(NodesWays nw, Node n) { 283 283 Set<Integer> adj = nw.nodes.get(n); 284 284 if (adj == null || adj.isEmpty()) return null; -
trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
r9078 r10043 446 446 } 447 447 448 private void updateWaypointLabelCombobox(JosmComboBox<String> cb, JosmTextField tf, TemplateEntryProperty property) {448 private static void updateWaypointLabelCombobox(JosmComboBox<String> cb, JosmTextField tf, TemplateEntryProperty property) { 449 449 String labelPattern = property.getAsString(); 450 450 boolean found = false; … … 463 463 } 464 464 465 private void updateWaypointPattern(JosmComboBox<String> cb, JosmTextField tf) {465 private static void updateWaypointPattern(JosmComboBox<String> cb, JosmTextField tf) { 466 466 if (cb.getSelectedIndex() == WAYPOINT_LABEL_CUSTOM) { 467 467 tf.setEnabled(true); -
trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java
r10021 r10043 228 228 } 229 229 230 private JTable getTableForCache(final CacheAccess<String, BufferedImageCacheEntry> cache, final TableModel tableModel) {230 private static JTable getTableForCache(final CacheAccess<String, BufferedImageCacheEntry> cache, final TableModel tableModel) { 231 231 final JTable ret = new JTable(tableModel); 232 232 -
trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
r10016 r10043 771 771 } 772 772 773 private boolean confirmEulaAcceptance(PreferenceTabbedPane gui, String eulaUrl) {773 private static boolean confirmEulaAcceptance(PreferenceTabbedPane gui, String eulaUrl) { 774 774 URL url = null; 775 775 try { -
trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
r10003 r10043 345 345 } 346 346 347 private void minimizeSplitBounds(Split split, Rectangle bounds) {347 private static void minimizeSplitBounds(Split split, Rectangle bounds) { 348 348 Rectangle splitBounds = new Rectangle(bounds.x, bounds.y, 0, 0); 349 349 List<Node> splitChildren = split.getChildren(); … … 710 710 } 711 711 712 private void throwInvalidLayout(String msg, Node node) {712 private static void throwInvalidLayout(String msg, Node node) { 713 713 throw new InvalidLayoutException(msg, node); 714 714 } … … 759 759 } 760 760 761 private Divider dividerAt(Node root, int x, int y) {761 private static Divider dividerAt(Node root, int x, int y) { 762 762 if (root instanceof Divider) { 763 763 Divider divider = (Divider) root; … … 785 785 } 786 786 787 private boolean nodeOverlapsRectangle(Node node, Rectangle r2) {787 private static boolean nodeOverlapsRectangle(Node node, Rectangle r2) { 788 788 Rectangle r1 = node.getBounds(); 789 789 return
Note:
See TracChangeset
for help on using the changeset viewer.