Changeset 20606 in osm for applications/editors/josm/plugins/turnrestrictions/src

Timestamp:

2010-03-22T13:10:48+01:00 (14 years ago)

Author:

guggis

Message:

Added test cases and documentation

Location:

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions

Files:

• editor/RelationMemberEditorModel.java (modified) (1 diff)
• editor/TurnRestrictionComboBoxModel.java (modified) (1 diff)
• editor/TurnRestrictionEditorModel.java (modified) (8 diffs)
• editor/TurnRestrictionSelectionPopupPanel.java (modified) (1 diff)
• qa/IssuesModel.java (modified) (3 diffs)

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java

@@ -181 +181 @@
          * in whose context this editor is working 
          */
-        public void setVias(List<OsmPrimitive> vias){
+        public void setVias(List<OsmPrimitive> vias) throws IllegalArgumentException{
                 boolean viasDeleted = removeMembersWithRole("via");
                 if (vias == null || vias.isEmpty()){

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBoxModel.java

@@ -40 +40 @@
                 
                 String tagValue = model.getRestrictionTagValue();
-                if (tagValue == null) {
+                if (tagValue.trim().equals("")) {
                         selectedTagValue = null;
                 } else {

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorModel.java

@@ -68 +68 @@
         private  RelationMemberEditorModel memberModel;
         private  IssuesModel issuesModel;
+        private NavigationControler navigationControler;
         
         /**
@@ -73 +74 @@
          * 
          * @param layer the layer. Must not be null.
+         * @param navigationControler control to direct the user to specific UI components. Must not be null 
          * @throws IllegalArgumentException thrown if {@code layer} is null
          */
         public TurnRestrictionEditorModel(OsmDataLayer layer, NavigationControler navigationControler) throws IllegalArgumentException{
                 CheckParameterUtil.ensureParameterNotNull(layer, "layer");
+                CheckParameterUtil.ensureParameterNotNull(navigationControler, "navigationControler");
                 this.layer = layer;
+                this.navigationControler = navigationControler;
                 memberModel = new RelationMemberEditorModel(layer);
                 memberModel.addTableModelListener(new RelationMemberModelListener());
-                issuesModel = new IssuesModel(this,navigationControler);
+                issuesModel = new IssuesModel(this);
                 addObserver(issuesModel);
                 tagEditorModel.addTableModelListener(new TagEditorModelObserver());
@@ -214 +218 @@
         /**
          * Replies the current tag value for the tag <tt>restriction</tt>.
-         * null, if there isn't a tag <tt>restriction</tt>.  
+         * The empty tag, if there isn't a tag <tt>restriction</tt>.  
          * 
          * @return the tag value
@@ -220 +224 @@
         public String getRestrictionTagValue() {
                 TagCollection tags = tagEditorModel.getTagCollection();
-                if (!tags.hasTagsFor("restriction")) return null;
+                if (!tags.hasTagsFor("restriction")) return "";
                 return tags.getJoinedValues("restriction");
         }
@@ -238 +242 @@
                                 tm.setValue(value);
                         } else {
-                                tagEditorModel.add(new TagModel("restriction", value));
+                                tagEditorModel.add(new TagModel("restriction", value.trim().toLowerCase()));
                         }
                 }
@@ -262 +266 @@
          * must be equal to the dataset of this editor model, see {@see #getDataSet()}
          * 
+         * null values in {@see vias} are skipped. 
+         * 
          * @param vias the list of vias 
-         * @throws IllegalArgumentException thrown if one of the via objects is null or
-         * if it belongs to the wrong dataset 
-         */
-        public void setVias(List<OsmPrimitive> vias) {
+         * @throws IllegalArgumentException thrown if one of the via objects belongs to the wrong dataset 
+         */
+        public void setVias(List<OsmPrimitive> vias) throws IllegalArgumentException{
                 memberModel.setVias(vias);
         }
@@ -320 +325 @@
         public IssuesModel getIssuesModel() {
                 return issuesModel;
+        }
+        
+        public NavigationControler getNavigationControler() {
+                return navigationControler;
         }
         
@@ -422 +431 @@
                 }               
         }
-        
+
+        /* ----------------------------------------------------------------------------------------- */
+        /* inner classes                                                                             */
+        /* ----------------------------------------------------------------------------------------- */ 
         class TagEditorModelObserver implements TableModelListener {
                 public void tableChanged(TableModelEvent e) {

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionSelectionPopupPanel.java

@@ -354 +354 @@
                 public void focusLost(FocusEvent e) {
                         // if we loose the focus to a component outside of the popup panel
-                        // we hide the popup
-                        if (!SwingUtilities.isDescendingFrom(e.getOppositeComponent(), TurnRestrictionSelectionPopupPanel.this)) {
+                        // we hide the popup                    
+                        if (e.getOppositeComponent() == null ||!SwingUtilities.isDescendingFrom(e.getOppositeComponent(), TurnRestrictionSelectionPopupPanel.this)) {
                                 if (parentPopup != null){
                                         parentPopup.hide();

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IssuesModel.java

@@ -30 +30 @@
 public class IssuesModel extends Observable implements Observer{
         private final ArrayList<Issue> issues = new ArrayList<Issue>();
-        private NavigationControler navigationContoler;
         private TurnRestrictionEditorModel editorModel;
         
@@ -41 +40 @@
          * 
          * @param editorModel the editor model. Must not be null.
-         * @param controler the navigation controler. Must not be null.
          * @throws IllegalArgumentException thrown if controler is null
          */
-        public IssuesModel(TurnRestrictionEditorModel editorModel, NavigationControler controler) throws IllegalArgumentException{
+        public IssuesModel(TurnRestrictionEditorModel editorModel) throws IllegalArgumentException{
                 CheckParameterUtil.ensureParameterNotNull(editorModel, "editorModel");
-                CheckParameterUtil.ensureParameterNotNull(controler, "controler");
-                this.navigationContoler = controler;
                 this.editorModel = editorModel;
                 this.editorModel.addObserver(this);
@@ -193 +189 @@
         
         public NavigationControler getNavigationControler() {
-                return navigationContoler;
+                return editorModel.getNavigationControler();
         }