/ - Diff - gvSIG projections - gvSIG

Revision 627

             this.crs = crs;
+        }
         @Override
         public IDatum getDatum() {
             return new IDatum() {
                 @Override
                 public double getEIFlattening() {
                     return getCoordinateReferenceSystem().getDatum().getEllipsoid()
                             .getReciprocalFlattening();
+                }
                 @Override
                 public double getESemiMajorAxis() {
                     return getCoordinateReferenceSystem().getDatum().getEllipsoid()
                             .getSemiMajorAxis();
-...
             };
+        }
         @Override
         public Point2D createPoint(double x, double y) {
             return new Point2D.Double(x, y);
+        }
         @Override
         public String getAbrev() {
             return getCoordinateReferenceSystem().getReference();
+        }
         @Override
         public String getFullCode() {
             return getCoordinateReferenceSystem().getReference();
+        }
         @Override
         public void drawGrid(Graphics2D g, ViewPortData vp) {
             throw new UnsupportedOperationException("Not implemented");
+        }
         @Override
         public void setGridColor(Color gridColor) {
             throw new UnsupportedOperationException("Not implemented");
+        }
         @Override
         public Color getGridColor() {
             throw new UnsupportedOperationException("Not implemented");
+        }
         @Override
         public ICoordTrans getCT(IProjection dest) {
             return new DefaultICoordTrans(this, (DefaultIProjection) dest);
+        }
         @Override
         public Point2D toGeo(Point2D pt) {
             CoordinateReferenceSystem geographic = crs.createGeographic();
-...
             return new Point2D.Double(coords[0], coords[1]);
+        }
         @Override
         public Point2D fromGeo(Point2D gPt, Point2D mPt) {
             CoordinateReferenceSystem geographic = crs.createGeographic();
-...
             return mPt;
+        }
         @Override
         public double getScale(double minX, double maxX, double width, double dpi) {
             double scale = ((maxX - minX) * // metros
                     (dpi / 2.54 * 100.0))
-...
             return scale;
+        }
         @Override
         public Rectangle2D getExtent(Rectangle2D extent, double scale,
                 double wImage, double hImage, double mapUnits, double distanceUnits,
                 double dpi) {
-...
             return rec;
+        }
         @Override
         public boolean isProjected() {
             return getCoordinateReferenceSystem().isProjected();
+        }
         @Override
         public Object clone() throws CloneNotSupportedException {
             DefaultIProjection cloned = (DefaultIProjection) super.clone();
             cloned.crs
-...
             return crs;
+        }
         @Override
         public String toString() {
             return crs.toString();
+        }
         @Override
         public String export(String format) {
             throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
             return null;
+        }
         @Override
         public boolean equals(Object obj) {
             if (this == obj) {
                 return true;
-...
             return this.getFullCode().equalsIgnoreCase(((DefaultIProjection) obj).getFullCode());
+        }
         @Override
         public int hashCode() {
             return this.getFullCode().hashCode();
+        }

     import java.awt.Dimension;
     import java.awt.event.ActionEvent;
     import java.awt.event.ActionListener;
     import java.awt.event.KeyAdapter;
     import java.awt.event.KeyEvent;
     import javax.swing.JComponent;
     import javax.swing.event.ListDataEvent;
     import javax.swing.event.ListDataListener;
     import javax.swing.event.ListSelectionEvent;
     import javax.swing.event.ListSelectionListener;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
-...
                     codeModel.applyFilter(txtCode.getText());
+                }
             });
             this.txtCode.addKeyListener(new KeyAdapter() {
                 @Override
                 public void keyTyped(KeyEvent e) {
                     if( e.getKeyChar()=='\n') {
                         codeModel.applyFilter(txtCode.getText());
                     } else if( e.getKeyChar()=='\033') {
                         txtCode.setText("");
                         codeModel.applyFilter("");
+                    }
                     super.keyTyped(e); //To change body of generated methods, choose Tools | Templates.
+                }
             });
             lstCodes.addListSelectionListener(new ListSelectionListener() {
                 @Override
                 public void valueChanged(ListSelectionEvent e) {
                     CoordinateReferenceSystem crs = getSelectedCoordinateReferenceSystem();
                     if( crs == null ) {
                         txtDefinition.setText("");
                     } else {
                         txtDefinition.setText(crs.getDefinition());
+                    }
+                }
             });
+        }
-...
             if (crs != null) {
                 authorityModel.setSelectedAuthority(crs.getAuthorityName());
                 this.lstCodes.setSelectedValue(crs.getCode(), true);
                 this.txtDefinition.setText(crs.getDefinition());
+            }
+        }
+    }

     import javax.swing.AbstractListModel;
     import javax.swing.ComboBoxModel;
     import javax.swing.ListModel;
     import javax.swing.event.ListDataEvent;
     import javax.swing.event.ListDataListener;
     import org.apache.commons.io.FilenameUtils;
-...
+     *
      * @author gvSIG Team
      */
     public class CodeListModel extends AbstractListModel implements
         ListModel, ListDataListener {
     public class CodeListModel
         extends AbstractListModel
+        {
         private static final long serialVersionUID = -5594433634336286602L;
-...
         private List<String> filteredCodes;
         private String filterPattern=null;
         private String selectedCode;
     //    private String selectedCode;
         private AuthorityComboBoxModel authorityModel;
         private final CoordinateReferenceSystemManager manager;
         @SuppressWarnings("LeakingThisInConstructor")
         public CodeListModel(CoordinateReferenceSystemManager manager,
             AuthorityComboBoxModel authorityModel) {
             AuthorityComboBoxModel theAuthorityModel) {
             this.manager = manager;
             authorityModel.addListDataListener(this);
             this.authorityModel = theAuthorityModel;
             this.authorityModel.addListDataListener(new ListDataListener() {
                 @Override
                 public void intervalAdded(ListDataEvent e) {
+                }
                 @Override
                 public void intervalRemoved(ListDataEvent e) {
+                }
                 @Override
                 public void contentsChanged(ListDataEvent e) {
                     String authority = authorityModel.getSelectedAuthority();
                     updateAuthority(authority);
+                }
             });
+        }
         @Override
-...
         @Override
         public Object getElementAt(int index) {
             return filteredCodes == null ? null : filteredCodes.get(index);
             if( filteredCodes == null || index <0 || index>this.filteredCodes.size() ) {
                 return null;
+            }
             return filteredCodes.get(index);
+        }
     //    @Override
     //    public void setSelectedItem(Object anItem) {
     //        if ((selectedCode != null && !selectedCode.equals(anItem))
     //            || selectedCode == null && anItem != null) {
     //            selectedCode = anItem.toString();
     //            fireContentsChanged(this, -1, -1);
     //        }
     //    }
     //
     //    @Override
     //    public Object getSelectedItem() {
     //        return getSelectedCode();
     //    }
     //
     //    public String getSelectedCode() {
     //        return selectedCode;
     //    }
     //
     //    public void setSelectedCode(String selectedCode) {
     //        setSelectedItem(selectedCode);
     //    }
         @Override
         public void intervalAdded(ListDataEvent e) {
             // Nothing to do
         private void updateAuthority(String authority) {
             allCodes = manager.getCodes(authority);
             this.applyFilter(this.filterPattern);
+        }
         @Override
         public void intervalRemoved(ListDataEvent e) {
             // Nothing to do
+        }
         @SuppressWarnings("unchecked")
         @Override
         public void contentsChanged(ListDataEvent e) {
             // A new authority has been selected
             if (e.getSource() != null
                 && e.getSource() instanceof AuthorityComboBoxModel) {
                 AuthorityComboBoxModel authorityModel =
                     (AuthorityComboBoxModel) e.getSource();
                 String authority = authorityModel.getSelectedAuthority();
                 selectedCode = null;
                 allCodes = manager.getCodes(authority);
                 this.applyFilter(this.filterPattern);
                 fireContentsChanged(this, -1, -1);
+            }
+        }
         public void applyFilter(String pattern) {
             this.filterPattern = pattern;
-...
                 if( !this.filterPattern.contains("*") ) {
                     this.filterPattern = this.filterPattern + "*";
+                }
                 this.filteredCodes = new ArrayList<>();
                 List filteredCodes = new ArrayList<>();
                 for (String code : allCodes) {
                     if( FilenameUtils.wildcardMatch(code, this.filterPattern, IOCase.INSENSITIVE)) {
                         this.filteredCodes.add(code);
                         filteredCodes.add(code);
+                    }
+                }
                 fireIntervalRemoved(this, 0,this.filteredCodes.size());
                 this.filteredCodes = filteredCodes;
+            }
             fireContentsChanged(this, -1, -1);
             fireIntervalAdded(this, 0,this.filteredCodes.size());
+        }
+    }

Also available in: Unified diff

Application: gvSIG desktop » gvSIG projections

Revision 627