Changeset 25349 in osm for applications

Timestamp:

2011-02-18T09:43:44+01:00 (14 years ago)

Author:

stoecker

Message:

fix dos line endings

Location:

applications/editors/josm/plugins/pdfimport/src/pdfimport

Files:

• LayerContents.java (modified) (1 diff)
• OrthogonalShapesFilter.java (modified) (2 diffs)
• PathOptimizer.java (modified) (6 diffs)
• PdfImportPlugin.java (modified) (1 diff)
• PdfMultiPath.java (modified) (1 diff)
• pdfbox/PageDrawer.java (modified) (3 diffs)
• pdfbox/operators/ClosePath.java (modified) (1 diff)

applications/editors/josm/plugins/pdfimport/src/pdfimport/LayerContents.java

@@ -1 +1 @@
 /**
- * 
+ *
  */
 package pdfimport;

applications/editors/josm/plugins/pdfimport/src/pdfimport/OrthogonalShapesFilter.java

@@ -9 +9 @@
                 tolerance = Math.toRadians(toleranceDegrees);
         }
-        
+
         public boolean isOrthogonal(PdfPath path) {
-                
+
                 if (path.points.size() < 3)
                         return false;
-                
+
                 int targetPos = path.isClosed() ? path.points.size(): path.points.size() - 1;
-                
+
                 for(int pos = 1; pos < targetPos; pos++) {
                         Point2D p1 = path.points.get(pos -1);
                         Point2D p2 = path.points.get(pos);
                         Point2D p3 = pos+1 == path.points.size() ? path.points.get(1) : path.points.get(pos+1);
-                        
+
                         double angle1 = Math.atan2(p2.getY() - p1.getY(),p2.getX() - p1.getX());
                         double angle2 = Math.atan2(p3.getY() - p2.getY(),p3.getX() - p2.getX());
-                        
+
                         double angleDifference = angle1 - angle2;
                         while (angleDifference < 0) angleDifference += Math.PI;
@@ -30 +30 @@
                         //test straight angles
                         boolean hasGoodVariant = false;
-                        
-                        for (int quadrant = 0; quadrant <= 4; quadrant ++) { 
+
+                        for (int quadrant = 0; quadrant <= 4; quadrant ++) {
                                 double difference = angleDifference - Math.PI / 2 * quadrant;
                                 if (Math.abs(difference) <= tolerance)
                                         hasGoodVariant = true;
                         }
-                        
+
                         if (!hasGoodVariant)
                                 return false;
                 }
-                
+
                 return true;
         }

applications/editors/josm/plugins/pdfimport/src/pdfimport/PathOptimizer.java

@@ -586 +586 @@
         {
                 if (!closed && !single) {
-                        return Collections.singletonList(layer);                        
-                }
-                
+                        return Collections.singletonList(layer);
+                }
+
                 OrthogonalShapesFilter of = new OrthogonalShapesFilter(10);
 
@@ -601 +601 @@
                         boolean pathUnclosed = !path.isClosed() && closed;
                         boolean pathSingleSegment = path.points.size() <= 3 && single;
-                        
+
                         if (pathSingleSegment) {
                                 singleSegmentPaths.add(path);
                         }
                         else if (pathUnclosed) {
-                                
+
                                 if (pathOrthgonal) {
                                         orthogonalPaths.add(path);
@@ -616 +616 @@
                         else {
                                 if (pathOrthgonal) {
-                                        orthogonalClosedPaths.add(path);        
+                                        orthogonalClosedPaths.add(path);
                                 }
                                 else
@@ -622 +622 @@
                                         closedPaths.add(path);
                                 }
-                                
+
                         }
                 }
@@ -642 +642 @@
                         layers.add(l);
                 }
-                
+
 
                 if (orthogonalPaths.size() > 0) {
@@ -650 +650 @@
                         layers.add(l);
                 }
-                
+
                 if (orthogonalClosedPaths.size() > 0) {
                         LayerContents l = new LayerContents();

applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportPlugin.java

@@ -15 +15 @@
 public class PdfImportPlugin extends Plugin {
 
-    protected String name;
+        protected String name;
 
-    public PdfImportPlugin(PluginInformation info) {
-        super(info);
-        name = tr("Import PDf file");
-        JMenu toolsMenu = null;
-        for (int i = 0; i < Main.main.menu.getMenuCount() && toolsMenu == null; i++) {
-            JMenu menu = Main.main.menu.getMenu(i);
-            String name = menu.getText();
-            if (name != null && name.equals(tr("Tools"))) {
-                toolsMenu = menu;
-            }
-        }
+        public PdfImportPlugin(PluginInformation info) {
+                super(info);
+                name = tr("Import PDf file");
+                JMenu toolsMenu = null;
+                for (int i = 0; i < Main.main.menu.getMenuCount() && toolsMenu == null; i++) {
+                        JMenu menu = Main.main.menu.getMenu(i);
+                        String name = menu.getText();
+                        if (name != null && name.equals(tr("Tools"))) {
+                                toolsMenu = menu;
+                        }
+                }
 
-        if (toolsMenu == null) {
-            toolsMenu = new JMenu(name);
-            toolsMenu.add(new JMenuItem(new PdfImportAction()));
-            Main.main.menu.add(toolsMenu, 2);
-        } else {
-            toolsMenu.addSeparator();
-            toolsMenu.add(new JMenuItem(new PdfImportAction()));
-        }
-    }
+                if (toolsMenu == null) {
+                        toolsMenu = new JMenu(name);
+                        toolsMenu.add(new JMenuItem(new PdfImportAction()));
+                        Main.main.menu.add(toolsMenu, 2);
+                } else {
+                        toolsMenu.addSeparator();
+                        toolsMenu.add(new JMenuItem(new PdfImportAction()));
+                }
+        }
 }

applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfMultiPath.java

@@ -11 +11 @@
                 paths = paths2;
         }
-                
+
 }

applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/PageDrawer.java

@@ -186 +186 @@
          *
          * @param newStroke The current stroke.
-         * 
+         *
          */
         public void setStroke(BasicStroke newStroke)
@@ -217 +217 @@
          * @param awtImage The image to draw.
          * @param at The transformation to use when drawing.
-         * 
+         *
          */
         public void drawImage(){
@@ -257 +257 @@
          *
          * @param windingRule The winding rule this path will use.
-         * 
+         *
          */
         public void setClippingPath(int windingRule)

applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/ClosePath.java

@@ -38 +38 @@
          * @param operator The operator that is being executed.
          * @param arguments List
-         * 
+         *
          * @throws IOException if something went wrong during logging
          */