Changeset 22557 in osm for applications/editors/josm/plugins/toms
- Timestamp:
- 2010-08-03T18:33:20+02:00 (14 years ago)
- Location:
- applications/editors/josm/plugins/toms/src
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java
r22537 r22557 712 712 713 713 lM01Icon03 = new JLabel(); 714 lM01Icon03.setBounds(new Rectangle(205, 13 0, 60, 70));714 lM01Icon03.setBounds(new Rectangle(205, 135, 70, 60)); 715 715 lM01Icon03.setIcon(null); 716 716 lM01Icon03.setText(""); … … 1245 1245 buoy.setLightChar(c); 1246 1246 buoy.setLightGroup(g); 1247 //buoy.setLightColour();1247 // buoy.setLightColour(); 1248 1248 1249 1249 buoy.paintSign(); -
applications/editors/josm/plugins/toms/src/toms/seamarks/SeaMark.java
r22527 r22557 91 91 public final static int LIGHT_MAJOR = 1; 92 92 public final static int LIGHT_MINOR = 2; 93 public final static int LIGHT_FLOAT = 3; 94 public final static int LIGHT_HOUSE = 4; 93 95 94 96 /** -
applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java
r22527 r22557 117 117 case ISOL_BEACON: 118 118 Main.main.undoRedo.add(new ChangePropertyCommand(node, 119 "seamark:b uoy_isolated_danger:shape", "beacon"));119 "seamark:beacon_isolated_danger:shape", "stake")); 120 120 break; 121 121 default: -
applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java
r22527 r22557 488 488 super.saveSign("beacon_lateral"); 489 489 Main.main.undoRedo.add(new ChangePropertyCommand(node, 490 "seamark:buoy_lateral:shape", " beacon"));490 "seamark:buoy_lateral:shape", "stake")); 491 491 break; 492 492 case LAT_TOWER: … … 563 563 super.saveSign("beacon_lateral"); 564 564 Main.main.undoRedo.add(new ChangePropertyCommand(node, 565 "seamark:buoy_lateral:shape", " beacon"));565 "seamark:buoy_lateral:shape", "stake")); 566 566 break; 567 567 case LAT_TOWER: … … 621 621 super.saveSign("buoy_lateral"); 622 622 Main.main.undoRedo.add(new ChangePropertyCommand(node, 623 "seamark:buoy_lateral:shape", "con e"));623 "seamark:buoy_lateral:shape", "conical")); 624 624 break; 625 625 case LAT_PILLAR: … … 636 636 super.saveSign("beacon_lateral"); 637 637 Main.main.undoRedo.add(new ChangePropertyCommand(node, 638 "seamark:buoy_lateral:shape", " beacon"));638 "seamark:buoy_lateral:shape", "stake")); 639 639 break; 640 640 case LAT_TOWER: … … 695 695 super.saveSign("buoy_lateral"); 696 696 Main.main.undoRedo.add(new ChangePropertyCommand(node, 697 "seamark:buoy_lateral:shape", "con e"));697 "seamark:buoy_lateral:shape", "conical")); 698 698 break; 699 699 case LAT_PILLAR: … … 710 710 super.saveSign("beacon_lateral"); 711 711 Main.main.undoRedo.add(new ChangePropertyCommand(node, 712 "seamark:buoy_lateral:shape", " beacon"));712 "seamark:buoy_lateral:shape", "stake")); 713 713 break; 714 714 case LAT_TOWER: … … 939 939 940 940 case STARBOARD_HAND: 941 if (str.compareTo("con e") == 0)941 if (str.compareTo("conical") == 0) 942 942 setStyleIndex(LAT_CONE); 943 943 else if (str.compareTo("pillar") == 0) … … 954 954 955 955 case PREF_STARBOARD_HAND: 956 if (str.compareTo("con e") == 0)956 if (str.compareTo("conical") == 0) 957 957 setStyleIndex(LAT_CONE); 958 958 else if (str.compareTo("pillar") == 0) -
applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyNota.java
r22527 r22557 57 57 dlg.cbM01StyleOfMark.addItem("Major Light"); 58 58 dlg.cbM01StyleOfMark.addItem("Minor Light"); 59 dlg.cbM01StyleOfMark.addItem("Light Float"); 60 dlg.cbM01StyleOfMark.addItem("Lighthouse"); 59 61 60 62 if (style >= dlg.cbM01StyleOfMark.getItemCount()) … … 79 81 switch (getStyleIndex()) { 80 82 case SeaMark.LIGHT_MAJOR: 83 case SeaMark.LIGHT_HOUSE: 81 84 dlg.lM01Icon01.setIcon(new ImageIcon(getClass().getResource( 82 85 "/images/Light_Major.png"))); … … 86 89 dlg.lM01Icon01.setIcon(new ImageIcon(getClass().getResource( 87 90 "/images/Light_Minor.png"))); 91 break; 92 93 case SeaMark.LIGHT_FLOAT: 94 dlg.lM01Icon01.setIcon(new ImageIcon(getClass().getResource( 95 "/images/Major_Float.png"))); 88 96 break; 89 97 … … 116 124 case LIGHT_MINOR: 117 125 super.saveSign("minor_light"); 126 break; 127 case LIGHT_FLOAT: 128 super.saveSign("major_floating_light"); 118 129 break; 119 130 default: -
applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java
r22527 r22557 23 23 dlg.cbM01StyleOfMark.addItem("Pillar Buoy"); 24 24 dlg.cbM01StyleOfMark.addItem("Spar Buoy"); 25 dlg.cbM01StyleOfMark.addItem("Beacon Buoy");25 dlg.cbM01StyleOfMark.addItem("Beacon"); 26 26 dlg.cbM01StyleOfMark.addItem("Sphere Buoy"); 27 27 dlg.cbM01StyleOfMark.addItem("Barrel"); … … 65 65 case SPEC_BEACON: 66 66 if (isFired()) 67 dlg.lM01Icon01.setIcon(new ImageIcon(getClass().getResource(68 "/images/Special_Purpose_Beacon_Lit.png")));67 dlg.lM01Icon01.setIcon(new ImageIcon(getClass().getResource( 68 "/images/Special_Purpose_Beacon_Lit.png"))); 69 69 else 70 70 dlg.lM01Icon01.setIcon(new ImageIcon(getClass().getResource( 71 "/images/Special_Purpose_Beacon.png")));71 "/images/Special_Purpose_Beacon.png"))); 72 72 break; 73 73 case SPEC_SPHERE: … … 91 91 c = ""; 92 92 } 93 93 94 94 switch (getStyleIndex()) { 95 95 case SPEC_PILLAR: … … 115 115 } 116 116 117 super.saveSign("buoy_special_purpose"); 117 if (getStyleIndex() == SPEC_BEACON) 118 super.saveSign("beacon_special_purpose"); 119 else 120 super.saveSign("buoy_special_purpose"); 118 121 119 122 switch (getStyleIndex()) { … … 129 132 Main.main.undoRedo.add(new ChangePropertyCommand(node, 130 133 "seamark:buoy_special_purpose:shape", "sphere")); 134 break; 135 case SPEC_BEACON: 136 Main.main.undoRedo.add(new ChangePropertyCommand(node, 137 "seamark:beacon_special_purpose:shape", "stake")); 131 138 break; 132 139 case SPEC_BARREL: … … 224 231 if (keys.containsKey("seamark:buoy_special_purpose:shape")) { 225 232 str = keys.get("seamark:buoy_special_purpose:shape"); 226 233 227 234 if (str.compareTo("pillar") == 0) 228 235 setStyleIndex(SPEC_PILLAR);
Note:
See TracChangeset
for help on using the changeset viewer.