Changeset 23162 in osm for applications/editors/josm/plugins/toms
- Timestamp:
- 2010-09-14T20:32:14+02:00 (14 years ago)
- Location:
- applications/editors/josm/plugins/toms/src/toms
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java
r23155 r23162 1130 1130 if (it == null) 1131 1131 return; 1132 if (it. compareTo(Messages.getString("SmpDialogAction.212")) == 0) //$NON-NLS-1$1132 if (it.equals(Messages.getString("SmpDialogAction.212"))) //$NON-NLS-1$ 1133 1133 return; 1134 1134 if (buoy == null) 1135 1135 return; 1136 1136 1137 if (it.contains("+")) { //$NON-NLS-1$ 1138 i1 = it.indexOf("+"); //$NON-NLS-1$ 1139 i2 = it.length(); 1140 if (c.isEmpty()) //$NON-NLS-1$ 1141 c = it; 1142 else 1143 c = c + it.substring(i1, i2); 1137 if (it.contains("(")) { 1138 i1 = it.indexOf("("); 1139 i2 = it.indexOf(")"); 1140 c = it.substring(i1+1, i2); 1141 it = it.substring(0, i1) + it.substring(i2+1); 1144 1142 } 1145 if (c.isEmpty()) //$NON-NLS-1$ 1146 c = it; 1147 buoy.setLightChar(c); 1143 System.out.println(it + " " + c); 1144 if (!c.isEmpty()) 1145 buoy.setLightGroup(c);; 1146 buoy.setLightChar(it); 1148 1147 buoy.paintSign(); 1149 1148 } -
applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java
r23158 r23162 520 520 } 521 521 522 c = LightChar[0]; 523 522 c = getLightChar(); 524 523 if (c.contains("+")) { 525 524 i1 = c.indexOf("+"); … … 527 526 c = c.substring(0, i1); 528 527 } 529 530 if (!LightGroup[0].isEmpty()) 531 c = c + "(" + LightGroup[0] + ")"; 528 if (!getLightGroup().isEmpty()) 529 c = c + "(" + getLightGroup() + ")"; 532 530 if (tmp != null) 533 531 c = c + tmp; 534 535 c = c + " " + LightColour[0];536 lp = LightPeriod[0];532 dlg.cbM01Kennung.setSelectedItem(c); 533 c = c + " " + getLightColour(); 534 lp = getLightPeriod(); 537 535 if (!lp.isEmpty()) 538 536 c = c + " " + lp + "s"; 539 537 dlg.lM01FireMark.setText(c); 540 541 538 dlg.cM01Fired.setVisible(true); 542 539 dlg.lM01Kennung.setVisible(true); … … 614 611 } else { 615 612 dlg.lM01FireMark.setText(""); 613 dlg.rbM01Fired1.setVisible(false); 614 dlg.rbM01FiredN.setVisible(false); 615 dlg.cbM01Kennung.setVisible(false); 616 dlg.lM01Kennung.setVisible(false); 617 dlg.tfM01Height.setVisible(false); 618 dlg.lM01Height.setVisible(false); 619 dlg.tfM01Range.setVisible(false); 620 dlg.lM01Range.setVisible(false); 621 dlg.cbM01Colour.setVisible(false); 622 dlg.lM01Colour.setVisible(false); 623 dlg.cbM01Sector.setVisible(false); 624 dlg.lM01Sector.setVisible(false); 625 dlg.tfM01Group.setVisible(false); 626 dlg.lM01Group.setVisible(false); 627 dlg.tfM01RepeatTime.setVisible(false); 628 dlg.lM01RepeatTime.setVisible(false); 629 dlg.tfM01Bearing.setVisible(false); 630 dlg.lM01Bearing.setVisible(false); 631 dlg.tfM02Bearing.setVisible(false); 632 dlg.tfM01Radius.setVisible(false); 616 633 } 617 634 } else {
Note:
See TracChangeset
for help on using the changeset viewer.