Changeset 28157 in osm for applications/editors
- Timestamp:
- 2012-03-27T23:29:27+02:00 (12 years ago)
- Location:
- applications/editors/josm/plugins/smed/plugs/oseam/src
- Files:
-
- 27 added
- 26 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java
r27734 r28157 20 20 public PanelLights panelLights = null; 21 21 public PanelMore panelMore = null; 22 public PanelNotice panelNotice = null; 22 23 public PanelTop panelTop = null; 23 24 public PanelFog panelFog = null; … … 181 182 panelMore.setBounds(new Rectangle(40, 165, 360, 160)); 182 183 panelMore.setVisible(false); 184 panelNotice = new PanelNotice(dlg); 185 panelNotice.setBounds(new Rectangle(40, 165, 360, 160)); 186 panelNotice.setVisible(false); 183 187 panelTop = new PanelTop(dlg); 184 188 panelTop.setBounds(new Rectangle(40, 165, 360, 160)); … … 203 207 add(panelLights); 204 208 add(panelMore); 209 add(panelNotice); 205 210 add(panelTop); 206 211 add(panelFog); … … 284 289 panelLights.setVisible(false); 285 290 panelMore.setVisible(false); 291 panelNotice.setVisible(false); 286 292 panelTop.setVisible(false); 287 293 panelFog.setVisible(false); … … 309 315 panelHaz.syncPanel(); 310 316 break; 317 case NTC: 318 panelNotice.setVisible(true); 311 319 case SPP: 312 320 specButton.setBorderPainted(true); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java
r28147 r28157 111 111 private ActionListener alNotice = new ActionListener() { 112 112 public void actionPerformed(java.awt.event.ActionEvent e) { 113 dlg.panelMain.mark.clrMark(); 113 114 if (noticeButton.isSelected()) { 115 dlg.panelMain.mark.setObject(Obj.NOTMRK); 114 116 noticeButton.setBorderPainted(true); 115 117 } else { 118 dlg.panelMain.mark.setObject(Obj.UNKOBJ); 116 119 noticeButton.setBorderPainted(false); 117 120 } 121 dlg.panelMain.syncPanel(); 118 122 } 119 123 }; … … 193 197 addCatItem(Messages.getString("Anchorage"), Cat.SPM_ANCH); 194 198 mooringBox = new JComboBox(); 195 mooringBox.setBounds(new Rectangle(5, 1 30, 160, 20));199 mooringBox.setBounds(new Rectangle(5, 142, 160, 18)); 196 200 add(mooringBox); 197 201 mooringBox.setVisible(false); … … 221 225 noticeButton.addActionListener(alNotice); 222 226 add(noticeButton); 223 noticeButton.setVisible(false);224 227 225 228 mooringButton.setBounds(new Rectangle(136, 64, 34, 32)); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java
r28147 r28157 1297 1297 tmp = true; 1298 1298 break; 1299 case NOTMRK: 1300 if (getCategory() != Cat.NOCAT) 1301 tmp = true; 1299 1302 case LNDMRK: 1300 1303 if ((getCategory() != Cat.NOCAT) || (getFunc() != Fnc.UNKFNC)) … … 1405 1408 str = keys.get("seamark:name"); 1406 1409 setName(str); 1407 }1408 if (getName().isEmpty()) {1409 if (keys.containsKey("name")) {1410 str = keys.get("name");1411 setName(str);1412 }1413 1410 } 1414 1411
Note:
See TracChangeset
for help on using the changeset viewer.