Changeset 97 for trunk/src/org/expeditee/actions/Simple.java

Timestamp:

06/10/08 10:03:03 (16 years ago)

Author:

ra33

Message:

Lots of changes!!

File:

• trunk/src/org/expeditee/actions/Simple.java (modified) (7 diffs)

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

@@ -804 +804 @@
                                         if (s.startsWith(targetAttribute)) {
                                                 attributeItem = text;
-                                                AttributeUtils.setSingleValue(attributeItem, value);
+                                                AttributeUtils.replaceValue(attributeItem, value);
                                                 found = true;
                                                 break;
@@ -1484 +1484 @@
                                 parametres = 2;
                         } else if (tokens[0].equals("ifexistingframe")) {
-                                result = FrameIO.DoesFrameExist(context.getPrimitives()
+                                result = FrameIO.canAccessFrame(context.getPrimitives()
                                                 .getStringValue(tokens[1]));
                         } else if (tokens[0].equals("ifexistingframeset")) {
                                 String framesetName = context.getPrimitives().getStringValue(
                                                 tokens[1]);
-                                result = FrameIO.DoesFramesetExist(framesetName);
+                                result = FrameIO.canAccessFrameset(framesetName);
                         } else {
                                 // assertVariableType(variable, 1, SPointer.itemPrefix);
@@ -1654 +1654 @@
                         Frame frame = (Frame) context.getPointers().getVariable(tokens[1])
                                         .getValue();
-                        boolean success = FrameIO.DeleteFrame(frame);
-
+                        String errorMessage = "Error deleting " + frame.getName();
+                        boolean success = false;
+                        try {
+                                success = FrameIO.DeleteFrame(frame);
+                                if (!success)
+                                        FrameGraphics.WarningMessage(errorMessage);
+                        } catch (Exception e) {
+                                // If an exception is thrown then success is false
+                                FrameGraphics
+                                                .WarningMessage(errorMessage
+                                                                + (e.getMessage() != null ? ". "
+                                                                                + e.getMessage() : ""));
+                        }
                         if (tokens.length > 2) {
                                 context.getPrimitives().setValue(tokens[2],
@@ -1665 +1676 @@
                                         tokens[1]);
                         boolean success = FrameIO.DeleteFrameset(framesetName);
-
+                        if (!success)
+                                FrameGraphics.WarningMessage("Error deleting " + framesetName);
                         if (tokens.length > 2) {
                                 context.getPrimitives().setValue(tokens[2],
@@ -1686 +1698 @@
                         boolean success = FrameIO.CopyFrameset(framesetToCopy,
                                         copiedFrameset);
-
+                        if (!success)
+                                FrameGraphics.WarningMessage("Error copying " + framesetToCopy);
                         if (tokens.length > 3) {
                                 context.getPrimitives().setValue(tokens[3],
@@ -1710 +1723 @@
                         String fileContents = FrameIO.ForceSaveFrame(freshCopy);
                         boolean success = fileContents != null;
+                        if (!success)
+                                FrameGraphics.WarningMessage("Error copying " + frameToCopy.getName());
                         FrameIO.ResumeCache();
                         if (tokens.length > 4) {
@@ -1982 +1997 @@
                         boolean success = true;
                         try {
-                                frameSet = Conversion.getFrameset(frameName, false);
+                                frameSet = Conversion.getFramesetName(frameName, false);
                                 frameNo = Conversion.getFrameNumber(frameName);
                         } catch (Exception e) {
                                 success = false;
+                                FrameGraphics.WarningMessage("Error parsing " + frameName);
                         }
                         // assertPrimitiveType(tokens[2], 2);