[Swift-commit] r2773 - in trunk: . src/org/griphyn/vdl/karajan

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2009-03-30 00:24:57 -0500 (Mon, 30 Mar 2009)
New Revision: 2773

Modified:
   trunk/CHANGES.txt
   trunk/src/org/griphyn/vdl/karajan/Loader.java
Log:
Removed support for .dtm file extension which was deprecated in Swift 0.4

Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt	2009-03-30 05:23:56 UTC (rev 2772)
+++ trunk/CHANGES.txt	2009-03-30 05:24:57 UTC (rev 2773)
@@ -1,3 +1,6 @@
+(03/30/09)
+*** Removed support for .dtm file extension which was deprecated in Swift 0.4
+
 (03/29/09)
 *** Added console text interface to provide live information about swift 
     runs.

Modified: trunk/src/org/griphyn/vdl/karajan/Loader.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/Loader.java	2009-03-30 05:23:56 UTC (rev 2772)
+++ trunk/src/org/griphyn/vdl/karajan/Loader.java	2009-03-30 05:24:57 UTC (rev 2773)
@@ -122,17 +122,7 @@
                 System.exit(4);
             }
 
-            /**
-             * This deprecation should stay until at least after Swift 0.4 is
-             * released; sometime after that, this test and the subsequent
-             * support for .dtm extensions should be removed.
-             */
-            if (project.endsWith(".dtm")) {
-                logger
-                    .warn("Source file extension .dtm is deprecated and will not be supported in future versions. Use .swift extension instead.");
-            }
-
-            if (project.endsWith(".dtm") || project.endsWith(".swift")) {
+            if (project.endsWith(".swift")) {
                 try {
                     project = compile(project);
                 }
@@ -344,7 +334,7 @@
         ap.setExecutableName("swift");
         ap
             .addOption(ArgumentParser.DEFAULT,
-                "A file (.dtm or .kml) to execute", "file",
+                "A file (.swift or .kml) to execute", "file",
                 ArgumentParser.OPTIONAL);
 
         ap.addFlag(ARG_HELP, "Display usage information");