Displaying differences for changeset
 
display as  

nbproject/project.properties

@@ -34,9 +34,9 @@
     ${libs.javaee-endorsed-api-6.0.classpath}
 excludes=
 includes=**
-j2ee.compile.on.save=false
-j2ee.copy.static.files.on.save=false
-j2ee.deploy.on.save=false
+j2ee.compile.on.save=true
+j2ee.copy.static.files.on.save=true
+j2ee.deploy.on.save=true
 j2ee.platform=1.6-web
 j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.4.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-spdy.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar
 j2ee.server.type=Tomcat

src/java/m/sq/ApplicationConfig.java

@@ -38,5 +38,6 @@
         resources.add(csip.ReportService.class);
         resources.add(csip.UIService.class);
         resources.add(m.sq.sci.SCI_V1_0.class);
+        resources.add(m.sq.stir.STIR_V1_0.class);
     }
 }

src/java/m/sq/Constants.java

@@ -19,4 +19,10 @@
     public static final String KEY_SCI_TOTAL = "sci_total";
     
     //stir
+    public static final String KEY_MANAGEMENT = "management";
+    public static final String KEY_DURATION_IN_MAN = "duration_in_man";
+    public static final String KEY_OPERATIONS = "operations";
+    public static final String KEY_STIR = "stir";
+    public static final String KEY_TOTAL_STIR = "total_stir";
+    public static final String KEY_AVERAGE_ANNUAL_STIR = "average_annual_stir";
 }

src/java/m/sq/sci/SCI_V1_0.java

@@ -55,13 +55,9 @@
     public void doProcess() throws Exception {
         
         if (water_erosion < wind_erosion)
-            {
                 sci_total = wind_sci - SCI_FACTOR * water_erosion;
-            }
             else
-            {
                 sci_total = water_sci - SCI_FACTOR * wind_erosion;
-            }
     }