Changeset 21 for trunk/src/org/expeditee/simple

Timestamp:

05/08/08 14:30:09 (16 years ago)

Author:

ra33

Message:

 

Location:

trunk/src/org/expeditee/simple

Files:

• Context.java (modified) (1 diff)
• IncorrectTypeException.java (modified) (1 diff)
• Primitives.java (modified) (2 diffs)
• SBoolean.java (modified) (2 diffs)
• SCharacter.java (modified) (1 diff)
• SInteger.java (modified) (1 diff)
• SPrimitive.java (modified) (1 diff)
• SReal.java (modified) (1 diff)

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

@@ -225 +225 @@
 
         public void createFrameset(String framesetNameVar, String successVar)
-                        throws Exception {
-                // Get the values to be set
-                String framesetName = primitives_.getStringValue(framesetNameVar);
-                Frame firstFrame = FrameIO.CreateNewFrameset(framesetName);
-
-                if (successVar != null) {
-                        Boolean success = firstFrame != null;
+                        throws IncorrectTypeException {
+                boolean success = true;
+                try {
+                        // Get the values to be set
+                        String framesetName = primitives_.getStringValue(framesetNameVar);
+                        Frame firstFrame = FrameIO.CreateNewFrameset(framesetName);
+                        success = firstFrame != null;
+                } catch (Exception e) {
+                        success = false;
+                }
+                if (successVar != null) {
                         primitives_.setValue(successVar, new SBoolean(success));
                 }

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

@@ -3 +3 @@
 public class IncorrectTypeException extends RuntimeException {
         static final long serialVersionUID = -7034897190745766939L;
-
+        
         public IncorrectTypeException(String type, int no) {
                 super("Expected param " + no + " to be " + type);

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

@@ -24 +24 @@
 
         public void setValue(String variableName, SPrimitive newValue)
-                        throws Exception {
+                        throws IncorrectTypeException {
                 try {
                         // if it is an existing variable change the value
@@ -49 +49 @@
          *             if the variable name is invalid
          */
-        public void add(String name, SPrimitive value) throws Exception {
+        public void add(String name, SPrimitive value) throws IncorrectTypeException {
                 // figure out the type and add it...
                 SPrimitive newVar;

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

@@ -12 +12 @@
         }
 
-        public SBoolean(Boolean value) throws Exception {
+        public SBoolean(Boolean value) throws IncorrectTypeException {
                 super(value);
         }
@@ -44 +44 @@
 
         @Override
-        public void setValue(SPrimitive v) throws Exception {
+        public void setValue(SPrimitive v) throws IncorrectTypeException {
                 value_ = v.booleanValue();
         }

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

@@ -50 +50 @@
 
         @Override
-        public void setValue(SPrimitive v) throws Exception {
+        public void setValue(SPrimitive v) throws IncorrectTypeException {
                 value_ = v.characterValue();
         }

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

@@ -53 +53 @@
 
         @Override
-        public void setValue(SPrimitive v) throws Exception {
+        public void setValue(SPrimitive v) throws IncorrectTypeException {
                 value_ = v.integerValue();
         }

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

@@ -15 +15 @@
         }
 
-        public Long integerValue() throws Exception {
-                throw new Exception("Can not convert " + this.getClass().getName()
-                                + " to Integer");
+        public Long integerValue() throws IncorrectTypeException {
+                throw new IncorrectTypeException("integer",this.getClass().getName());
         }
 
-        public Boolean booleanValue() throws Exception {
-                throw new Exception("Can not convert " + this.getClass().getName()
-                                + " to Boolean");
+        public Boolean booleanValue() throws IncorrectTypeException {
+                throw new IncorrectTypeException("boolean", this.getClass().getName());
         }
 
-        public Double doubleValue() throws Exception {
-                throw new Exception("Can not convert " + this.getClass().getName()
-                                + " to Real");
+        public Double doubleValue() throws IncorrectTypeException {
+                throw new IncorrectTypeException("real", this.getClass().getName());
         }
 
-        public Character characterValue() throws Exception {
-                throw new Exception("Can not convert " + this.getClass().getName()
-                                + " to Character");
+        public Character characterValue() throws IncorrectTypeException {
+                throw new IncorrectTypeException("character", this.getClass().getName());
         }
 
-        public abstract void setValue(SPrimitive v) throws Exception;
+        public abstract void setValue(SPrimitive v) throws IncorrectTypeException;
 
         @Override
-        public void setValue(SVariable<T> v) throws Exception {
+        public void setValue(SVariable<T> v) throws IncorrectTypeException {
                 if (v instanceof SPrimitive) {
                         setValue((SPrimitive<?>) v);
                         return;
                 }
-                throw new Exception("Can not set primitive variable with pointer");
+                throw new IncorrectTypeException("primitive", "pointer");
         }
 

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

@@ -49 +49 @@
 
         @Override
-        public void setValue(SPrimitive v) throws Exception {
+        public void setValue(SPrimitive v) throws IncorrectTypeException {
                 value_ = v.doubleValue();
         }