Changeset 6890 in josm
- Timestamp:
- 2014-02-27T02:50:12+01:00 (11 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 109 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java
r6783 r6890 284 284 285 285 @Override 286 protected void installAdapters() {286 protected final void installAdapters() { 287 287 super.installAdapters(); 288 288 // make this action listen to zoom and mapframe change events -
trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java
r6889 r6890 134 134 135 135 @Override 136 protected void notifySelectedState() {136 protected final void notifySelectedState() { 137 137 super.notifySelectedState(); 138 138 fireExpertModeChanged(isSelected()); -
trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
r6792 r6890 226 226 } 227 227 228 public void updateOffset() {228 public final void updateOffset() { 229 229 ignoreListener = true; 230 230 updateOffsetIntl(); … … 232 232 } 233 233 234 public void updateOffsetIntl() {234 public final void updateOffsetIntl() { 235 235 // Support projections with very small numbers (e.g. 4326) 236 236 int precision = Main.getProjection().getDefaultZoomInPPD() >= 1.0 ? 2 : 7; -
trunk/src/org/openstreetmap/josm/actions/JosmAction.java
r6889 r6890 193 193 * @param tooltip The text to display in tooltip. Can be {@code null} 194 194 */ 195 public void setTooltip(String tooltip) {195 public final void setTooltip(String tooltip) { 196 196 if (tooltip != null) { 197 197 putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tooltip, sc)); -
trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java
r6803 r6890 205 205 * @return <tt>true</tt> (as specified by {@link Collection#add}) 206 206 */ 207 public boolean addDownloadTaskClass(Class<? extends DownloadTask> taskClass) {207 public final boolean addDownloadTaskClass(Class<? extends DownloadTask> taskClass) { 208 208 return this.downloadTasks.add(taskClass); 209 209 } -
trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java
r6643 r6890 166 166 * Initializes action. 167 167 */ 168 public void initialize() {168 public final void initialize() { 169 169 layers = new ArrayList<Layer>(Main.map.mapView.getAllLayersAsList()); 170 170 exporters = new HashMap<Layer, SessionLayerExporter>(); … … 205 205 } 206 206 207 protected Component build() {207 protected final Component build() { 208 208 JPanel p = new JPanel(new GridBagLayout()); 209 209 JPanel ip = new JPanel(new GridBagLayout()); -
trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java
r6085 r6890 77 77 } 78 78 79 protected void updateEnabledState() {79 protected final void updateEnabledState() { 80 80 if (Main.main == null || Main.main.getEditLayer() != this.table.getLayer()) { 81 81 setEnabled(false); -
trunk/src/org/openstreetmap/josm/command/MoveCommand.java
r6881 r6890 153 153 * Save curent displacement to restore in case of some problems 154 154 */ 155 public void saveCheckpoint() {155 public final void saveCheckpoint() { 156 156 backupX = x; 157 157 backupY = y; -
trunk/src/org/openstreetmap/josm/command/PurgeCommand.java
r6883 r6890 67 67 } 68 68 69 protected void saveIncomplete(Collection<OsmPrimitive> makeIncomplete) {69 protected final void saveIncomplete(Collection<OsmPrimitive> makeIncomplete) { 70 70 makeIncompleteData = new Storage<PrimitiveData>(new Storage.PrimitiveIdHash()); 71 71 makeIncompleteData_byPrimId = makeIncompleteData.foreignKey(new Storage.PrimitiveIdHash()); -
trunk/src/org/openstreetmap/josm/command/RotateCommand.java
r6830 r6890 52 52 * Get angle between the horizontal axis and the line formed by the pivot and give points. 53 53 **/ 54 protected double getAngle(EastNorth currentEN) {54 protected final double getAngle(EastNorth currentEN) { 55 55 if ( pivot == null ) 56 56 return 0.0; // should never happen by contract … … 62 62 */ 63 63 @Override 64 public void handleEvent(EastNorth currentEN) {64 public final void handleEvent(EastNorth currentEN) { 65 65 double currentAngle = getAngle(currentEN); 66 66 rotationAngle = currentAngle - startAngle; -
trunk/src/org/openstreetmap/josm/command/ScaleCommand.java
r6296 r6890 54 54 */ 55 55 @Override 56 public void handleEvent(EastNorth currentEN) {56 public final void handleEvent(EastNorth currentEN) { 57 57 double startAngle = Math.atan2(startEN.east()-pivot.east(), startEN.north()-pivot.north()); 58 58 double endAngle = Math.atan2(currentEN.east()-pivot.east(), currentEN.north()-pivot.north()); … … 62 62 transformNodes(); 63 63 } 64 65 64 66 65 /** -
trunk/src/org/openstreetmap/josm/command/TransformNodesCommand.java
r6830 r6890 38 38 * Stores the state of the nodes before the command. 39 39 */ 40 protected void storeOldState() {40 protected final void storeOldState() { 41 41 for (Node n : this.nodes) { 42 42 oldStates.put(n, new OldNodeState(n)); -
trunk/src/org/openstreetmap/josm/data/APIDataSet.java
r6801 r6890 59 59 } 60 60 61 public void init(Collection<OsmPrimitive> primitives) {61 public final void init(Collection<OsmPrimitive> primitives) { 62 62 toAdd.clear(); 63 63 toUpdate.clear(); … … 286 286 } 287 287 288 public void build(Collection<Relation> relations) {288 public final void build(Collection<Relation> relations) { 289 289 this.relations = new HashSet<Relation>(); 290 290 for(Relation relation: relations) { -
trunk/src/org/openstreetmap/josm/data/osm/BBox.java
r6204 r6890 107 107 } 108 108 109 public void add(LatLon c) {109 public final void add(LatLon c) { 110 110 add(c.lon(), c.lat()); 111 111 } … … 114 114 * Extends this bbox to include the point (x, y) 115 115 */ 116 public void add(double x, double y) {116 public final void add(double x, double y) { 117 117 xmin = Math.min(xmin, x); 118 118 xmax = Math.max(xmax, x); … … 122 122 } 123 123 124 public void add(BBox box) {124 public final void add(BBox box) { 125 125 xmin = Math.min(xmin, box.xmin); 126 126 xmax = Math.max(xmax, box.xmax); -
trunk/src/org/openstreetmap/josm/data/osm/NodeData.java
r6009 r6890 32 32 33 33 @Override 34 public void setCoor(LatLon coor) {34 public final void setCoor(LatLon coor) { 35 35 if (coor == null) { 36 36 this.lat = Double.NaN; -
trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
r6889 r6890 570 570 571 571 @Override 572 protected void setIncomplete(boolean incomplete) {572 protected final void setIncomplete(boolean incomplete) { 573 573 boolean locked = writeLock(); 574 574 try { -
trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java
r6084 r6890 76 76 } 77 77 78 public void visitAll() {78 public final void visitAll() { 79 79 for (OsmPrimitive osm : primitives) { 80 80 firstIteration = true; -
trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
r6296 r6890 356 356 * corner of the box 357 357 */ 358 LatLon coor() {358 final LatLon coor() { 359 359 return QuadTiling.tile2LatLon(this.quad); 360 360 } … … 404 404 405 405 @Override 406 public void clear() {406 public final void clear() { 407 407 root = new QBLevel<T>(this); 408 408 search_cache = null; … … 500 500 int iterated_over; 501 501 502 QBLevel<T> next_content_node(QBLevel<T> q) {502 final QBLevel<T> next_content_node(QBLevel<T> q) { 503 503 if (q == null) 504 504 return null; -
trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java
r6823 r6890 193 193 * @param tag the tag to add 194 194 */ 195 public void add(Tag tag){195 public final void add(Tag tag){ 196 196 if (tag == null) return; 197 197 if (tags.contains(tag)) return; … … 205 205 * @param tags the collection of tags 206 206 */ 207 public void add(Collection<Tag> tags) {207 public final void add(Collection<Tag> tags) { 208 208 if (tags == null) return; 209 209 for (Tag tag: tags){ … … 218 218 * @param tags the other tag collection 219 219 */ 220 public void add(TagCollection tags) {220 public final void add(TagCollection tags) { 221 221 if (tags == null) return; 222 222 this.tags.addAll(tags.tags); -
trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java
r6830 r6890 73 73 * @return the coordinates. May be null. 74 74 */ 75 public LatLon getCoords() {75 public final LatLon getCoords() { 76 76 return coords; 77 77 } … … 81 81 * @param coords the coordinates. Can be null. 82 82 */ 83 public void setCoords(LatLon coords) {83 public final void setCoords(LatLon coords) { 84 84 this.coords = coords; 85 85 } -
trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
r6830 r6890 38 38 private Map<String, String> tags; 39 39 40 protected void ensurePositiveLong(long value, String name) {40 protected final void ensurePositiveLong(long value, String name) { 41 41 if (value <= 0) { 42 42 throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected. Got ''{1}''.", name, value)); -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
r6883 r6890 359 359 } 360 360 361 private void load(Relation r) {361 private final void load(Relation r) { 362 362 MultipolygonRoleMatcher matcher = getMultipolygonRoleMatcher(); 363 363 … … 537 537 } 538 538 539 private void addInnerToOuters() {539 private final void addInnerToOuters() { 540 540 541 541 if (innerPolygons.isEmpty()) { -
trunk/src/org/openstreetmap/josm/data/preferences/CachedProperty.java
r6069 r6890 19 19 } 20 20 21 protected void updateValue() {21 protected final void updateValue() { 22 22 if (!Main.pref.get(key).isEmpty()) { 23 23 this.value = fromString(Main.pref.get(key)); -
trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java
r6883 r6890 119 119 } 120 120 121 public void update(String pref) throws ProjectionConfigurationException {121 public final void update(String pref) throws ProjectionConfigurationException { 122 122 this.pref = pref; 123 123 if (pref == null) { -
trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java
r5817 r6890 49 49 private String subGridName; 50 50 51 /** 52 * Constructs a new {@code NTV2GridShift}. 53 */ 51 54 public NTV2GridShift() { 52 55 } … … 233 236 * @param d latitude value in seconds 234 237 */ 235 public void setLatSeconds(double d) {238 public final void setLatSeconds(double d) { 236 239 lat = d; 237 240 } … … 241 244 * @param d latitude value in degree 242 245 */ 243 public void setLatDegrees(double d) {246 public final void setLatDegrees(double d) { 244 247 lat = d * 3600.0; 245 248 } … … 249 252 * @param b availability of latitude accuracy 250 253 */ 251 public void setLatAccuracyAvailable(boolean b) {254 public final void setLatAccuracyAvailable(boolean b) { 252 255 latAccuracyAvailable = b; 253 256 } … … 257 260 * @param d latitude accuracy in seconds 258 261 */ 259 public void setLatAccuracySeconds(double d) {262 public final void setLatAccuracySeconds(double d) { 260 263 latAccuracy = d; 261 264 } … … 265 268 * @param d latitude shift in seconds 266 269 */ 267 public void setLatShiftSeconds(double d) {270 public final void setLatShiftSeconds(double d) { 268 271 latShift = d; 269 272 } … … 273 276 * @param d latitude value in seconds, west direction is positive 274 277 */ 275 public void setLonPositiveWestSeconds(double d) {278 public final void setLonPositiveWestSeconds(double d) { 276 279 lon = d; 277 280 } … … 281 284 * @param d latitude value in degree, est direction is positive 282 285 */ 283 public void setLonPositiveEastDegrees(double d) {286 public final void setLonPositiveEastDegrees(double d) { 284 287 lon = d * -3600.0; 285 288 } … … 289 292 * @param b availability of longitude accuracy 290 293 */ 291 public void setLonAccuracyAvailable(boolean b) {294 public final void setLonAccuracyAvailable(boolean b) { 292 295 lonAccuracyAvailable = b; 293 296 } … … 297 300 * @param d longitude accuracy in seconds 298 301 */ 299 public void setLonAccuracySeconds(double d) {302 public final void setLonAccuracySeconds(double d) { 300 303 lonAccuracy = d; 301 304 } … … 305 308 * @param d longitude shift in seconds, west direction is positive 306 309 */ 307 public void setLonShiftPositiveWestSeconds(double d) {310 public final void setLonShiftPositiveWestSeconds(double d) { 308 311 lonShift = d; 309 312 } -
trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java
r6852 r6890 284 284 * until most bugs were discovered while keeping the processing time reasonable) 285 285 */ 286 public void initializeGridDetail() {286 public final void initializeGridDetail() { 287 287 String code = Main.getProjection().toCode(); 288 288 if (Arrays.asList(ProjectionPreference.wgs84.allCodes()).contains(code)) { -
trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java
r6883 r6890 90 90 } 91 91 92 protected void build() {92 protected final void build() { 93 93 model = new RelationMemberTableModel(); 94 94 model.addTableModelListener(this); … … 275 275 private static class RelationMemberTableColumnModel extends DefaultTableColumnModel{ 276 276 277 protected void createColumns() {277 protected final void createColumns() { 278 278 TableColumn col = null; 279 279 -
trunk/src/org/openstreetmap/josm/gui/actionsupport/LogShowDialog.java
r5927 r6890 29 29 } 30 30 31 protected JPanel build(String msg, String log) {31 protected final JPanel build(String msg, String log) { 32 32 JPanel p = new JPanel(new GridBagLayout()); 33 33 JLabel lbl = new JLabel(msg); -
trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
r6793 r6890 226 226 } 227 227 228 public void setFileCacheEnabled(boolean enabled) {228 public final void setFileCacheEnabled(boolean enabled) { 229 229 if (enabled) { 230 230 setTileLoader(cachedLoader); … … 234 234 } 235 235 236 public void setMaxTilesInMemory(int tiles) {236 public final void setMaxTilesInMemory(int tiles) { 237 237 ((MemoryTileCache) getTileCache()).setCacheSize(tiles); 238 238 } 239 240 239 241 240 /** -
trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
r6883 r6890 96 96 * builds the UI 97 97 */ 98 protected void build() {98 protected final void build() { 99 99 setLayout(new GridBagLayout()); 100 100 -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
r6887 r6890 86 86 * loads the required icons 87 87 */ 88 protected void loadIcons() {88 protected final void loadIcons() { 89 89 mergeComplete = ImageProvider.get("dialogs", "valid.png" ); 90 90 mergeIncomplete = ImageProvider.get("dialogs/conflict", "mergeincomplete.png" ); … … 94 94 * builds the UI 95 95 */ 96 protected void build() {96 protected final void build() { 97 97 tabbedPane = new JTabbedPane(); 98 98 -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
r6830 r6890 227 227 } 228 228 229 public void setFrozen(boolean isFrozen) {229 public final void setFrozen(boolean isFrozen) { 230 230 boolean oldValue = this.isFrozen; 231 231 this.isFrozen = isFrozen; … … 233 233 } 234 234 235 public boolean isFrozen() {235 public final boolean isFrozen() { 236 236 return isFrozen; 237 237 } -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
r6883 r6890 260 260 } 261 261 262 protected void build() {262 protected final void build() { 263 263 setLayout(new GridBagLayout()); 264 264 GridBagConstraints gc = new GridBagConstraints(); -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java
r5291 r6890 10 10 public class NodeListColumnModel extends DefaultTableColumnModel { 11 11 12 protected void createColumns(TableCellRenderer renderer) {12 protected final void createColumns(TableCellRenderer renderer) { 13 13 14 14 TableColumn col = null; -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
r6792 r6890 269 269 } 270 270 271 protected void build() {271 protected final void build() { 272 272 setLayout(new GridBagLayout()); 273 273 buildHeaderRow(); … … 277 277 } 278 278 279 /** 280 * Constructs a new {@code PropertiesMerger}. 281 */ 279 282 public PropertiesMerger() { 280 283 model = new PropertiesMergeModel(); -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java
r5291 r6890 9 9 public class RelationMemberListColumnModel extends DefaultTableColumnModel{ 10 10 11 protected void createColumns() {11 protected final void createColumns() { 12 12 TableColumn col = null; 13 13 RelationMemberTableCellRenderer renderer = new RelationMemberTableCellRenderer(); -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java
r3083 r6890 10 10 public class TagMergeColumnModel extends DefaultTableColumnModel { 11 11 12 protected void createColumns(TableCellRenderer renderer) {12 protected final void createColumns(TableCellRenderer renderer) { 13 13 14 14 TableColumn col = null; -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
r6666 r6890 108 108 * build the user interface 109 109 */ 110 protected void build() {110 protected final void build() { 111 111 GridBagConstraints gc = new GridBagConstraints(); 112 112 setLayout(new GridBagLayout()); -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
r6889 r6890 166 166 } 167 167 168 protected void build() {168 protected final void build() { 169 169 getContentPane().setLayout(new BorderLayout()); 170 170 updateTitle(); … … 412 412 } 413 413 414 protected void updateEnabledState() {414 protected final void updateEnabledState() { 415 415 setEnabled(pnlTagConflictResolver.getModel().getNumConflicts() == 0 416 416 && pnlRelationMemberConflictResolver.getModel().getNumConflicts() == 0); -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java
r6792 r6890 61 61 * Tries to find the best decision based on the current values. 62 62 */ 63 protected void autoDecide() {63 protected final void autoDecide() { 64 64 this.type = MultiValueDecisionType.UNDECIDED; 65 65 // exactly one empty value ? -> delete the tag -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
r6889 r6890 75 75 } 76 76 77 protected void build() {77 protected final void build() { 78 78 setTitle(tr("Conflicts in pasted tags")); 79 79 allPrimitivesResolver = new TagConflictResolver(); -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
r6699 r6890 48 48 private JMultilineLabel lblHeader; 49 49 50 protected void build() {50 protected final void build() { 51 51 setLayout(new GridBagLayout()); 52 52 JPanel pnl = new JPanel(); -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java
r6524 r6890 23 23 } 24 24 25 protected void build() {25 protected final void build() { 26 26 setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS); 27 27 setSelectionMode(ListSelectionModel.SINGLE_SELECTION); -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java
r6616 r6890 86 86 } 87 87 88 protected void build() {88 protected final void build() { 89 89 setLayout(new BorderLayout()); 90 90 add(buildInfoPanel(), BorderLayout.NORTH); -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java
r6616 r6890 9 9 public class TagConflictResolverColumnModel extends DefaultTableColumnModel{ 10 10 11 protected void createColumns() {11 protected final void createColumns() { 12 12 TableColumn col = null; 13 13 MultiValueCellRenderer renderer = new MultiValueCellRenderer(); -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java
r6739 r6890 23 23 } 24 24 25 protected void build() {25 protected final void build() { 26 26 setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS); 27 27 setSelectionMode(ListSelectionModel.SINGLE_SELECTION); -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
r6889 r6890 151 151 } 152 152 153 protected void build() {153 protected final void build() { 154 154 setLayout(new BorderLayout()); 155 155 JScrollPane spQueryPanel = GuiHelper.embedInVerticalScrollPane(buildQueryPanel()); -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java
r6340 r6890 129 129 } 130 130 131 protected void build() {131 protected final void build() { 132 132 setLayout(new BorderLayout(0,5)); 133 133 setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); … … 136 136 } 137 137 138 /** 139 * Constructs a new {@code BasicChangesetQueryPanel}. 140 */ 138 141 public BasicChangesetQueryPanel() { 139 142 build(); -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java
r6084 r6890 78 78 } 79 79 80 81 protected void build() { 80 protected final void build() { 82 81 setTitle(tr("Query changesets")); 83 82 Container cp = getContentPane(); … … 95 94 addWindowListener(new WindowEventHandler()); 96 95 } 97 98 96 99 97 public ChangesetQueryDialog(Dialog parent) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java
r6814 r6890 93 93 } 94 94 95 protected void build() {95 protected final void build() { 96 96 setLayout(new GridBagLayout()); 97 97 setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); … … 113 113 gc.fill = GridBagConstraints.BOTH; 114 114 add(new JPanel(),gc); 115 116 } 115 } 116 117 /** 118 * Constructs a new {@code UrlBasedQueryPanel}. 119 */ 117 120 public UrlBasedQueryPanel() { 118 121 build(); -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
r6794 r6890 942 942 943 943 @Override 944 protected void updateEnabledState() {944 protected final void updateEnabledState() { 945 945 setEnabled( 946 946 (tagTable != null && tagTable.getSelectedRowCount() >= 1) -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
r6808 r6890 742 742 * Read tags from comboboxes and add it to all selected objects 743 743 */ 744 public void performTagAdding() {744 public final void performTagAdding() { 745 745 String key = Tag.removeWhiteSpaces(keys.getEditor().getItem().toString()); 746 746 String value = Tag.removeWhiteSpaces(values.getEditor().getItem().toString()); -
trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
r6706 r6890 292 292 * @param errors The error list that is used by a data layer 293 293 */ 294 public void setErrorList(List<TestError> errors) {294 public final void setErrorList(List<TestError> errors) { 295 295 this.errors = errors; 296 296 if (isVisible()) { -
trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java
r6883 r6890 224 224 bookmarks.save(); 225 225 } 226 protected void updateEnabledState() { 226 227 protected final void updateEnabledState() { 227 228 setEnabled(bookmarks.getSelectedIndices().length > 0); 228 229 } … … 261 262 } 262 263 } 263 protected void updateEnabledState() { 264 265 protected final void updateEnabledState() { 264 266 setEnabled(bookmarks.getSelectedIndices().length == 1); 265 267 } 268 266 269 @Override 267 270 public void valueChanged(ListSelectionEvent e) { -
trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
r6883 r6890 86 86 } 87 87 88 protected JPanel buildMainPanel() {88 protected final JPanel buildMainPanel() { 89 89 JPanel pnl = new JPanel(); 90 90 pnl.setLayout(new GridBagLayout()); … … 163 163 } 164 164 165 protected JPanel buildButtonPanel() {165 protected final JPanel buildButtonPanel() { 166 166 JPanel pnl = new JPanel(); 167 167 pnl.setLayout(new FlowLayout()); -
trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
r6883 r6890 299 299 } 300 300 301 protected void updateEnabledState() {301 protected final void updateEnabledState() { 302 302 setEnabled(cbSearchExpression.getText().trim().length() > 0); 303 303 } … … 427 427 TableColumn col3 = null; 428 428 TableColumn col4 = null; 429 protected void createColumns() {429 protected final void createColumns() { 430 430 TableColumn col = null; 431 431 NamedResultCellRenderer renderer = new NamedResultCellRenderer(); -
trunk/src/org/openstreetmap/josm/gui/download/TileSelection.java
r6830 r6890 22 22 private DownloadDialog parent; 23 23 24 protected void build() {24 protected final void build() { 25 25 chooser = new TileSelectionBBoxChooser(); 26 26 chooser.addPropertyChangeListener(this); -
trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
r6883 r6890 170 170 } 171 171 172 protected void build() {172 protected final void build() { 173 173 help = new JosmEditorPane(); 174 174 JosmHTMLEditorKit kit = new JosmHTMLEditorKit(); -
trunk/src/org/openstreetmap/josm/gui/layer/Layer.java
r6889 r6890 231 231 * 232 232 */ 233 public void setName(String name) {233 public final void setName(String name) { 234 234 if (name == null) { 235 235 name = ""; -
trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
r6889 r6890 452 452 } 453 453 454 private int getBestZoom() {454 private final int getBestZoom() { 455 455 double factor = getScaleFactor(1); 456 456 double result = Math.log(factor)/Math.log(2)/2+1; … … 1502 1502 1503 1503 @Override 1504 public boolean isProjectionSupported(Projection proj) {1504 public final boolean isProjectionSupported(Projection proj) { 1505 1505 return "EPSG:3857".equals(proj.toCode()) || "EPSG:4326".equals(proj.toCode()); 1506 1506 } 1507 1507 1508 1508 @Override 1509 public String nameSupportedProjections() {1509 public final String nameSupportedProjections() { 1510 1510 return tr("EPSG:4326 and Mercator projection are supported"); 1511 1511 } -
trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
r6830 r6890 269 269 } 270 270 271 public void initializeImages() {271 public final void initializeImages() { 272 272 GeorefImage[][] old = images; 273 273 images = new GeorefImage[dax][day]; -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java
r5926 r6890 129 129 130 130 @Override 131 public void setEnabled(boolean enabled) {131 public final void setEnabled(boolean enabled) { 132 132 super.setEnabled(enabled); 133 133 for (Component c: getComponents()) { … … 135 135 } 136 136 } 137 138 139 140 141 137 } -
trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java
r6889 r6890 246 246 * <tt>mappaint.nameOrder</tt> and <tt>mappaint.nameComplementOrder</tt>. 247 247 */ 248 public void initNameTagsFromPreferences() {248 public final void initNameTagsFromPreferences() { 249 249 if (Main.pref == null){ 250 250 this.nameTags = new ArrayList<String>(Arrays.asList(DEFAULT_NAME_TAGS)); -
trunk/src/org/openstreetmap/josm/gui/mappaint/xml/AreaPrototype.java
r6561 r6890 20 20 public AreaPrototype() { init(); } 21 21 22 public void init() 23 { 22 public final void init() { 24 23 priority = 0; 25 24 range = Range.ZERO_TO_INFINITY; -
trunk/src/org/openstreetmap/josm/gui/mappaint/xml/IconPrototype.java
r6561 r6890 20 20 public IconPrototype() { init(); } 21 21 22 public void init() {22 public final void init() { 23 23 priority = 0; 24 24 range = Range.ZERO_TO_INFINITY; -
trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinemodPrototype.java
r3836 r6890 20 20 21 21 @Override 22 public void init() 23 { 22 public final void init() { 24 23 super.init(); 25 24 over = true; … … 27 26 } 28 27 29 // get width for overlays 30 public float getWidth(float ref) 31 { 28 /** get width for overlays */ 29 public float getWidth(float ref) { 32 30 float res; 33 31 if(widthMode == WidthMode.ABSOLUTE) { -
trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlCondition.java
r6821 r6890 10 10 public String boolValue; 11 11 12 public XmlCondition() 13 { 12 public XmlCondition() { 14 13 init(); 15 14 } 16 public XmlCondition(XmlCondition c) 17 {15 16 public XmlCondition(XmlCondition c) { 18 17 key = c.key; 19 18 value = c.value; 20 19 boolValue = c.boolValue; 21 20 } 22 public String getKey() 23 {21 22 public String getKey() { 24 23 if(value != null) 25 24 return "n" + key + "=" + value; … … 29 28 return "x" + key; 30 29 } 31 public void init() 32 {30 31 public final void init() { 33 32 key = value = boolValue = null; 34 33 } 35 34 36 public String toString() 37 { 35 public String toString() { 38 36 return "Rule["+key+","+(boolValue != null ? "b="+boolValue:"v="+value)+"]"; 39 37 } 40 38 41 public void appendCode(StringBuilder sb) 42 { 39 public void appendCode(StringBuilder sb) { 43 40 sb.append("[k=").append(key); 44 41 -
trunk/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java
r5886 r6890 26 26 private JCheckBox cbSaveAccessTokenInPreferences; 27 27 28 protected void build() {28 protected final void build() { 29 29 setLayout(new GridBagLayout()); 30 30 GridBagConstraints gc = new GridBagConstraints(); -
trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java
r6883 r6890 51 51 private String apiUrl; 52 52 53 protected void build() {53 protected final void build() { 54 54 setLayout(new GridBagLayout()); 55 55 setBorder(BorderFactory.createEmptyBorder(3,3,3,3)); -
trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
r6883 r6890 263 263 } 264 264 265 protected void build() {265 protected final void build() { 266 266 setLayout(new BorderLayout()); 267 267 pnlPropertiesPanel = buildPropertiesPanel(); … … 345 345 } 346 346 347 protected void updateEnabledState() {347 protected final void updateEnabledState() { 348 348 setEnabled(valPassword.isValid() && valUserName.isValid()); 349 349 } -
trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java
r6883 r6890 23 23 private JosmPasswordField tfPassword; 24 24 25 protected JPanel buildUserNamePasswordPanel() {25 protected final JPanel buildUserNamePasswordPanel() { 26 26 JPanel pnl = new JPanel(new GridBagLayout()); 27 27 GridBagConstraints gc = new GridBagConstraints(); -
trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
r6889 r6890 153 153 } 154 154 155 protected void build() {155 protected final void build() { 156 156 setLayout(new BorderLayout()); 157 157 setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); … … 263 263 } 264 264 265 protected void updateEnabledState() {265 protected final void updateEnabledState() { 266 266 setEnabled(hasAccessToken()); 267 267 } -
trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java
r6845 r6890 161 161 * builds the UI 162 162 */ 163 protected void build() {163 protected final void build() { 164 164 getContentPane().setLayout(new BorderLayout()); 165 165 getContentPane().add(buildHeaderInfoPanel(), BorderLayout.NORTH); … … 348 348 } 349 349 350 public void updateEnabledState(OAuthToken token) {350 public final void updateEnabledState(OAuthToken token) { 351 351 setEnabled(token != null); 352 352 } -
trunk/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java
r6066 r6890 24 24 private JCheckBox cbModifyNotes; 25 25 26 protected void build() {26 protected final void build() { 27 27 setLayout(new GridBagLayout()); 28 28 GridBagConstraints gc = new GridBagConstraints(); … … 86 86 } 87 87 88 /** 89 * Constructs a new {@code OsmPrivilegesPanel}. 90 */ 88 91 public OsmPrivilegesPanel() { 89 92 build(); -
trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java
r6340 r6890 51 51 * build the UI 52 52 */ 53 protected void build() {53 protected final void build() { 54 54 setLayout(new BorderLayout()); 55 55 setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); … … 187 187 188 188 } 189 protected void build() {189 protected final void build() { 190 190 setLayout(new BorderLayout(0,5)); 191 191 JLabel lbl = new JLabel(tr("<html>Step 1/3: Retrieve an OAuth Request Token</html>")); … … 261 261 } 262 262 263 protected void build() {263 protected final void build() { 264 264 setLayout(new BorderLayout()); 265 265 add(buildTitlePanel(), BorderLayout.NORTH); … … 340 340 } 341 341 342 protected void build() {342 protected final void build() { 343 343 setLayout(new BorderLayout()); 344 344 add(buildTitlePanel(), BorderLayout.NORTH); -
trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
r6426 r6890 63 63 } 64 64 65 protected void build() {65 protected final void build() { 66 66 Container c = getContentPane(); 67 67 c.setLayout(new BorderLayout()); -
trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
r6883 r6890 871 871 } 872 872 873 protected void updateEnabledState() {873 protected final void updateEnabledState() { 874 874 setEnabled(tblActiveSources.getSelectedRowCount() > 0); 875 875 } … … 894 894 } 895 895 896 protected void updateEnabledState() {896 protected final void updateEnabledState() { 897 897 setEnabled(tblActiveSources.getSelectedRowCount() == 1); 898 898 } … … 942 942 } 943 943 944 public void updateEnabledState() {944 public final void updateEnabledState() { 945 945 setEnabled(activeSourcesModel.canMove(increment)); 946 946 } … … 969 969 } 970 970 971 protected void updateEnabledState() {971 protected final void updateEnabledState() { 972 972 setEnabled(lstAvailableSources.getSelectedIndices().length > 0); 973 973 } … … 1171 1171 } 1172 1172 1173 protected void updateEnabledState() {1173 protected final void updateEnabledState() { 1174 1174 setEnabled(tblIconPaths.getSelectedRowCount() > 0); 1175 1175 } … … 1194 1194 } 1195 1195 1196 protected void updateEnabledState() {1196 protected final void updateEnabledState() { 1197 1197 setEnabled(tblIconPaths.getSelectedRowCount() == 1); 1198 1198 } … … 1394 1394 * build the GUI 1395 1395 */ 1396 protected void build() {1396 protected final void build() { 1397 1397 setLayout(new GridBagLayout()); 1398 1398 GridBagConstraints gc = new GridBagConstraints(); -
trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java
r6767 r6890 64 64 } 65 65 66 protected JPanel build() {66 protected final JPanel build() { 67 67 JPanel p = new JPanel(new GridBagLayout()); 68 68 p.add(new JLabel(tr("Key: {0}", entry.getKey())), GBC.eol().insets(0,0,5,0)); -
trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java
r6767 r6890 75 75 } 76 76 77 protected JPanel build() {77 protected final JPanel build() { 78 78 JPanel p = new JPanel(new GridBagLayout()); 79 79 p.add(new JLabel(tr("Key: {0}", entry.getKey())), GBC.std(0,0).span(2).weight(1, 0).insets(0,0,5,10)); … … 158 158 } 159 159 160 protected void updateEnabledState() {160 protected final void updateEnabledState() { 161 161 setEnabled(entryList.getSelectedIndices().length == 1); 162 162 } -
trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java
r6792 r6890 93 93 } 94 94 95 protected JPanel build() {95 protected final JPanel build() { 96 96 JPanel p = new JPanel(new GridBagLayout()); 97 97 p.add(new JLabel(tr("Key: {0}", entry.getKey())), GBC.std(0,0).span(2).weight(1, 0).insets(0,0,5,10)); … … 178 178 } 179 179 180 protected void updateEnabledState() {180 protected final void updateEnabledState() { 181 181 setEnabled(entryList.getSelectedIndices().length == 1); 182 182 } -
trunk/src/org/openstreetmap/josm/gui/preferences/advanced/StringEditor.java
r6767 r6890 42 42 } 43 43 44 protected JPanel build(String orig) {44 protected final JPanel build(String orig) { 45 45 JPanel p = new JPanel(new GridBagLayout()); 46 46 p.add(new JLabel(tr("Key: {0}", entry.getKey())), GBC.eol().insets(0,0,5,0)); -
trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
r6764 r6890 319 319 * Loads preferences to UI controls 320 320 */ 321 public void loadPreferences () {321 public final void loadPreferences () { 322 322 makeAutoMarkers.setSelected(Main.pref.getBoolean("marker.makeautomarkers", true)); 323 323 if(layerName!=null && Main.pref.get("draw.rawgps.lines."+layerName).isEmpty() -
trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
r6733 r6890 496 496 } 497 497 498 protected void updateEnabledState() {498 protected final void updateEnabledState() { 499 499 setEnabled(activeTable.getSelectedRowCount() > 0); 500 500 } -
trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java
r6340 r6890 137 137 } 138 138 139 protected void build() {139 protected final void build() { 140 140 setLayout(new GridBagLayout()); 141 141 GridBagConstraints gc = new GridBagConstraints(); … … 167 167 * 168 168 */ 169 public void initFromPreferences() {169 public final void initFromPreferences() { 170 170 String pref = Main.pref.get("pluginmanager.version-based-update.policy", "ask"); 171 171 Policy p = Policy.fromPreferenceValue(pref); -
trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java
r6792 r6890 131 131 } 132 132 133 public void setCode(String code) {133 public final void setCode(String code) { 134 134 int idx = filteredData.indexOf(code); 135 135 if (idx != -1) { -
trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
r6854 r6890 58 58 } 59 59 60 private void build(String initialText, final ActionListener listener) {60 private final void build(String initialText, final ActionListener listener) { 61 61 input = new JosmTextField(30); 62 62 cbInput = new HistoryComboBox(); … … 96 96 97 97 @Override 98 public boolean isValid() {98 public final boolean isValid() { 99 99 try { 100 100 CustomProjection test = new CustomProjection(); -
trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
r6623 r6890 47 47 * builds the UI 48 48 */ 49 protected void build() {49 protected final void build() { 50 50 setLayout(new GridBagLayout()); 51 51 GridBagConstraints gc = new GridBagConstraints(); -
trunk/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java
r6643 r6890 41 41 * builds the UI 42 42 */ 43 protected void build() {43 protected final void build() { 44 44 setLayout(new GridBagLayout()); 45 45 setBorder(BorderFactory.createEmptyBorder(3,3,3,3)); -
trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
r6847 r6890 104 104 * builds the UI 105 105 */ 106 protected void build() {106 protected final void build() { 107 107 setLayout(new GridBagLayout()); 108 108 setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); … … 290 290 } 291 291 292 public void refreshView() {292 public final void refreshView() { 293 293 String v = OAuthAccessTokenHolder.getInstance().getAccessTokenKey(); 294 294 tfAccessTokenKey.setText(v == null? "" : v); -
trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
r6883 r6890 64 64 } 65 65 66 protected void build() {66 protected final void build() { 67 67 setLayout(new GridBagLayout()); 68 68 GridBagConstraints gc = new GridBagConstraints(); … … 205 205 } 206 206 207 protected void updateEnabledState() {207 protected final void updateEnabledState() { 208 208 String url = getStrippedApiUrl(); 209 209 boolean enabled = !url.isEmpty() && !url.equals(lastTestedUrl); -
trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java
r6883 r6890 114 114 * @return panel with HTTP proxy configuration 115 115 */ 116 protected JPanel buildHttpProxyConfigurationPanel() {116 protected final JPanel buildHttpProxyConfigurationPanel() { 117 117 JPanel pnl = new JPanel(new GridBagLayout()) { 118 118 @Override … … 190 190 * @return panel with SOCKS proxy configuration 191 191 */ 192 protected JPanel buildSocksProxyConfigurationPanel() {192 protected final JPanel buildSocksProxyConfigurationPanel() { 193 193 JPanel pnl = new JPanel(new GridBagLayout()) { 194 194 @Override … … 230 230 } 231 231 232 protected JPanel buildProxySettingsPanel() {232 protected final JPanel buildProxySettingsPanel() { 233 233 JPanel pnl = new JPanel(new GridBagLayout()); 234 234 GridBagConstraints gc = new GridBagConstraints(); … … 314 314 * Initializes the panel with the values from the preferences 315 315 */ 316 public void initFromPreferences() {316 public final void initFromPreferences() { 317 317 String policy = Main.pref.get(PROXY_POLICY, null); 318 318 ProxyPolicy pp = ProxyPolicy.fromName(policy); … … 365 365 } 366 366 367 protected void updateEnabledState() {367 protected final void updateEnabledState() { 368 368 boolean isHttpProxy = rbProxyPolicy.get(ProxyPolicy.USE_HTTP_PROXY).isSelected(); 369 369 for (Component c: pnlHttpProxyConfigurationPanel.getComponents()) { -
trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java
r6783 r6890 98 98 * builds the GUI 99 99 */ 100 protected void build() {100 protected final void build() { 101 101 setLayout(new GridBagLayout()); 102 102 JPanel tablePanel = buildTagTableEditorPanel(); -
trunk/src/org/openstreetmap/josm/gui/tagging/TagModel.java
r6316 r6890 47 47 * @param name the tag name 48 48 */ 49 public void setName(String name) {49 public final void setName(String name) { 50 50 name = (name == null) ? "" : name; 51 51 this.name = name; … … 70 70 * @param value the value. 71 71 */ 72 public void setValue(String value) {72 public final void setValue(String value) { 73 73 value = (value == null) ? "" : value; 74 74 clearValues(); -
trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java
r6524 r6890 268 268 } 269 269 270 protected void updateEnabledState() {270 protected final void updateEnabledState() { 271 271 if (isEditing() && getSelectedColumnCount() == 1 && getSelectedRowCount() == 1) { 272 272 setEnabled(true); … … 308 308 } 309 309 310 protected void updateEnabledState() {310 protected final void updateEnabledState() { 311 311 setEnabled(TagTable.this.isEnabled()); 312 312 } … … 357 357 } 358 358 359 protected void updateEnabledState() {359 protected final void updateEnabledState() { 360 360 setEnabled(TagTable.this.isEnabled()); 361 361 } … … 395 395 * initialize the table 396 396 */ 397 protected void init() {397 protected final void init() { 398 398 setAutoResizeMode(JTable.AUTO_RESIZE_OFF); 399 399 setRowSelectionAllowed(true); -
trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
r6883 r6890 444 444 } 445 445 446 protected void updateEnabledState() {446 protected final void updateEnabledState() { 447 447 setEnabled(Main.main != null && Main.main.getCurrentDataSet() != null); 448 448 } -
trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java
r6087 r6890 135 135 } 136 136 137 protected void init() {137 protected final void init() { 138 138 addFocusListener( 139 139 new FocusAdapter() { -
trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java
r6883 r6890 44 44 } 45 45 46 protected void build() {46 protected final void build() { 47 47 buildInputFields(); 48 48 setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); -
trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java
r6830 r6890 105 105 private final Set<JosmAction> disabledMenuActions = new HashSet<JosmAction>(); 106 106 107 protected void init() {107 protected final void init() { 108 108 addFocusListener(this); 109 109 } -
trunk/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java
r6040 r6890 23 23 private JosmEditorPane jepMessage; 24 24 25 protected void build() {25 protected final void build() { 26 26 setLayout(new BorderLayout()); 27 27 jepMessage = new JosmEditorPane("text/html", ""); … … 87 87 * @param text the text to display 88 88 */ 89 public void setText(String text) {89 public final void setText(String text) { 90 90 if (text == null) { 91 91 text = ""; -
trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java
r6832 r6890 107 107 * @since 5558 108 108 */ 109 protected Object findPrototypeDisplayValue(Collection<?> possibleValues) {109 protected final Object findPrototypeDisplayValue(Collection<?> possibleValues) { 110 110 Object result = null; 111 111 int maxHeight = -1; … … 154 154 } 155 155 156 protected void init(Object prototype) {156 protected final void init(Object prototype) { 157 157 if (prototype != null) { 158 158 setPrototypeDisplayValue(prototype); -
trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
r6380 r6890 91 91 92 92 /** Do not let anyone add mouse listeners */ 93 @Override public void addMouseListener(MouseListener l) { } 93 @Override 94 public void addMouseListener(MouseListener l) { } 94 95 95 96 /** … … 97 98 * @param state The new state 98 99 */ 99 public void setState(State state) {100 public final void setState(State state) { 100 101 model.setState(state); 101 102 } -
trunk/src/org/openstreetmap/josm/io/Capabilities.java
r6830 r6890 103 103 } 104 104 105 public void clear() {105 public final void clear() { 106 106 capabilities = new HashMap<String, HashMap<String,String>>(); 107 107 imageryBlacklist = new ArrayList<String>(); -
trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java
r6889 r6890 72 72 private Source source; 73 73 74 protected void parseErrorHeader(String errorHeader) {74 protected final void parseErrorHeader(String errorHeader) { 75 75 Pattern p = Pattern.compile(ERROR_HEADER_PATTERN); 76 76 Matcher m = p.matcher(errorHeader); -
trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java
r6714 r6890 104 104 * 105 105 */ 106 public void initFromPreferences() {106 public final void initFromPreferences() { 107 107 String value = Main.pref.get(ProxyPreferencesPanel.PROXY_POLICY); 108 108 if (value.length() == 0) { -
trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java
r6552 r6890 80 80 } 81 81 82 public void updateEnabledState() {82 public final void updateEnabledState() { 83 83 setEnabled(layer.requiresSaveToFile()); 84 84 } -
trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
r6883 r6890 1326 1326 private JCheckBox cbDontShowAgain; 1327 1327 1328 protected void build() {1328 protected final void build() { 1329 1329 setLayout(new GridBagLayout()); 1330 1330 GridBagConstraints gc = new GridBagConstraints(); -
trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java
r6843 r6890 192 192 } 193 193 194 private void scanManifest(Manifest manifest, boolean oldcheck) {194 private final void scanManifest(Manifest manifest, boolean oldcheck) { 195 195 String lang = LanguageInfo.getLanguageCodeManifest(); 196 196 Attributes attr = manifest.getMainAttributes(); … … 500 500 501 501 @Override 502 public String toString() {502 public final String toString() { 503 503 return getName(); 504 504 } -
trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java
r6883 r6890 59 59 protected enum CacheType {PLUGIN_LIST, ICON_LIST} 60 60 61 protected void init(Collection<String> sites, boolean displayErrMsg){61 protected final void init(Collection<String> sites, boolean displayErrMsg){ 62 62 this.sites = sites; 63 63 if (sites == null) { … … 88 88 init(sites, displayErrMsg); 89 89 } 90 91 90 92 91 @Override -
trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java
r6889 r6890 161 161 } 162 162 163 protected void initFromPreferences(String preferenceKey) throws WindowGeometryException {163 protected final void initFromPreferences(String preferenceKey) throws WindowGeometryException { 164 164 String value = Main.pref.get(preferenceKey); 165 165 if (value == null || value.isEmpty()) … … 173 173 } 174 174 175 protected void initFromWindowGeometry(WindowGeometry other) {175 protected final void initFromWindowGeometry(WindowGeometry other) { 176 176 this.topLeft = other.topLeft; 177 177 this.extent = other.extent;
Note:
See TracChangeset
for help on using the changeset viewer.