Changeset 270

Timestamp:

08/22/08 14:42:58 (16 years ago)

Author:

ra33

Message:

 

Location:

trunk/src/org/expeditee

Files:

• actions/Misc.java (modified) (1 diff)
• importer/FrameDNDTransferHandler.java (modified) (1 diff)
• simple/Primitives.java (modified) (1 diff)
• simple/Variables.java (modified) (1 diff)

trunk/src/org/expeditee/actions/Misc.java

@@ -790 +790 @@
                         MessageBay.errorMessage("Shapes must have at least 3 sides");
                 }
-                double angle = ((sides - 2) * 180.0F) / sides;
+                double angle = 180 - ((sides - 2) * 180.0F) / sides;
                 double curAngle = 0;
                 double size = 50F;

trunk/src/org/expeditee/importer/FrameDNDTransferHandler.java

@@ -254 +254 @@
                         Item lastItem = importFile(fileToImport, currentPoint);
 
-                        currentPoint.y += lastItem.getBoundsHeight();
+                        if (lastItem == null) {
+                                currentPoint.y += 30;
+                        } else {
+                                currentPoint.y += lastItem.getBoundsHeight();
+                        }
                         // of the item that was created
 
                         // TODO: Better placement strategy
-                        //if (currentPoint.y > (Browser._theBrowser.getHeight() - 20))
-                        //      currentPoint.y = Browser._theBrowser.getHeight() - 20;
+                        // if (currentPoint.y > (Browser._theBrowser.getHeight() - 20))
+                        // currentPoint.y = Browser._theBrowser.getHeight() - 20;
                 }
         }

trunk/src/org/expeditee/simple/Primitives.java

@@ -32 +32 @@
                         v.setValue(newValue);
                 } catch (Exception e) {
-                        // If the first variable doesnt exist then add it
-                        add(variableName, newValue);
+                        try{
+                                add(variableName, newValue);
+                        }catch(IncorrectTypeException ite){
+                                throw ite;
+                        }catch(Exception ex){
+                                //DO NOTHING... THIS SHOULD NOT HAPPEN
+                                //But the ANT builder is complaining
+                                ex.printStackTrace();
+                        }
                 }
         }

trunk/src/org/expeditee/simple/Variables.java

@@ -62 +62 @@
                         return;
                 }
+                //TODO:figure out how to fix the ANT build error
                 toSet.setValue(toGetValueFrom);
         }