csip-sq Displaying differences for changeset

Displaying differences for changeset

display as Allow wrapping

nbproject/project.properties

 @@ -1,93 +1,93 @@
--annotation.processing.enabled=true
--annotation.processing.enabled.in.editor=true
--annotation.processing.processors.list=
--annotation.processing.run.all.processors=true
--annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
--auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options=
--auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false
--auxiliary.org-netbeans-modules-css-prep.less_2e_mappings=/less:/css
--auxiliary.org-netbeans-modules-css-prep.sass_2e_compiler_2e_options=
--auxiliary.org-netbeans-modules-css-prep.sass_2e_enabled=false
--auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/scss:/css
--auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs
--build.classes.dir=${build.web.dir}/WEB-INF/classes
--build.classes.excludes=**/*.java,**/*.form
--build.dir=build
--build.generated.dir=${build.dir}/generated
--build.generated.sources.dir=${build.dir}/generated-sources
--build.test.classes.dir=${build.dir}/test/classes
--build.test.results.dir=${build.dir}/test/results
--build.web.dir=${build.dir}/web
--build.web.excludes=${build.classes.excludes}
--client.urlPart=
--compile.jsps=false
--conf.dir=${source.root}/conf
--debug.classpath=${build.classes.dir}:${javac.classpath}
--debug.test.classpath=\
--    ${run.test.classpath}
--display.browser=false
--dist.dir=dist
--dist.ear.war=${dist.dir}/${war.ear.name}
--dist.javadoc.dir=${dist.dir}/javadoc
--dist.war=${dist.dir}/${war.name}
--endorsed.classpath=\
--    ${libs.javaee-endorsed-api-6.0.classpath}
--excludes=
--includes=**
--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.1.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
--jar.compress=false
--javac.classpath=\
--    ${reference.csip-core.jar}:\
--    ${libs.CSIP-Jersey-2.16.classpath}
--# Space-separated list of extra javac options
--javac.compilerargs=
--javac.debug=true
--javac.deprecation=false
--javac.processorpath=\
--    ${javac.classpath}
--javac.source=1.8
--javac.target=1.8
--javac.test.classpath=\
--    ${javac.classpath}:\
--    ${build.classes.dir}
--javac.test.processorpath=\
--    ${javac.test.classpath}
--javadoc.additionalparam=
--javadoc.author=false
--javadoc.encoding=${source.encoding}
--javadoc.noindex=false
--javadoc.nonavbar=false
--javadoc.notree=false
--javadoc.preview=true
--javadoc.private=false
--javadoc.splitindex=true
--javadoc.use=true
--javadoc.version=false
--javadoc.windowtitle=
--lib.dir=${web.docbase.dir}/WEB-INF/lib
--persistence.xml.dir=${conf.dir}
--platform.active=default_platform
--project.csip-core=../csip-core
--reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar
--resource.dir=setup
--rest.config.type=ide
--run.test.classpath=\
--    ${javac.test.classpath}:\
--    ${build.test.classes.dir}
--# Space-separated list of JVM arguments used when running a class with a main method or a unit test
--# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
--runmain.jvmargs=
--source.encoding=UTF-8
--source.root=src
--src.dir=${source.root}/java
--test.src.dir=test
--war.content.additional=
--war.ear.name=${war.name}
--war.name=csip-sq.war
--web.docbase.dir=web
--webinf.dir=web/WEB-INF
++annotation.processing.enabled=true
++annotation.processing.enabled.in.editor=true
++annotation.processing.processors.list=
++annotation.processing.run.all.processors=true
++annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
++auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options=
++auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false
++auxiliary.org-netbeans-modules-css-prep.less_2e_mappings=/less:/css
++auxiliary.org-netbeans-modules-css-prep.sass_2e_compiler_2e_options=
++auxiliary.org-netbeans-modules-css-prep.sass_2e_enabled=false
++auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/scss:/css
++auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs
++build.classes.dir=${build.web.dir}/WEB-INF/classes
++build.classes.excludes=**/*.java,**/*.form
++build.dir=build
++build.generated.dir=${build.dir}/generated
++build.generated.sources.dir=${build.dir}/generated-sources
++build.test.classes.dir=${build.dir}/test/classes
++build.test.results.dir=${build.dir}/test/results
++build.web.dir=${build.dir}/web
++build.web.excludes=${build.classes.excludes}
++client.urlPart=
++compile.jsps=false
++conf.dir=${source.root}/conf
++debug.classpath=${build.classes.dir}:${javac.classpath}
++debug.test.classpath=\
++    ${run.test.classpath}
++display.browser=false
++dist.dir=dist
++dist.ear.war=${dist.dir}/${war.ear.name}
++dist.javadoc.dir=${dist.dir}/javadoc
++dist.war=${dist.dir}/${war.name}
++endorsed.classpath=\
++    ${libs.javaee-endorsed-api-6.0.classpath}
++excludes=
++includes=**
++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/SDMDriver-Beta.20.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
++jar.compress=false
++javac.classpath=\
++    ${reference.csip-core.jar}:\
++    ${libs.CSIP-Jersey-2.16.classpath}
++# Space-separated list of extra javac options
++javac.compilerargs=
++javac.debug=true
++javac.deprecation=false
++javac.processorpath=\
++    ${javac.classpath}
++javac.source=1.8
++javac.target=1.8
++javac.test.classpath=\
++    ${javac.classpath}:\
++    ${build.classes.dir}
++javac.test.processorpath=\
++    ${javac.test.classpath}
++javadoc.additionalparam=
++javadoc.author=false
++javadoc.encoding=${source.encoding}
++javadoc.noindex=false
++javadoc.nonavbar=false
++javadoc.notree=false
++javadoc.preview=true
++javadoc.private=false
++javadoc.splitindex=true
++javadoc.use=true
++javadoc.version=false
++javadoc.windowtitle=
++lib.dir=${web.docbase.dir}/WEB-INF/lib
++persistence.xml.dir=${conf.dir}
++platform.active=default_platform
++project.csip-core=../csip-core
++reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar
++resource.dir=setup
++rest.config.type=ide
++run.test.classpath=\
++    ${javac.test.classpath}:\
++    ${build.test.classes.dir}
++# Space-separated list of JVM arguments used when running a class with a main method or a unit test
++# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
++runmain.jvmargs=
++source.encoding=UTF-8
++source.root=src
++src.dir=${source.root}/java
++test.src.dir=test
++war.content.additional=
++war.ear.name=${war.name}
++war.name=csip-sq.war
++web.docbase.dir=web
++webinf.dir=web/WEB-INF

src/java/m/sq/ApplicationConfig.java

 @@ -39,6 +39,8 @@
           resources.add(csip.ReportService.class);
           resources.add(csip.UIService.class);
           resources.add(m.sq.sci.V1_0.class);
++        resources.add(m.sq.sci.V2_0.class);
++        resources.add(m.sq.sci.V2_1.class);
           resources.add(m.sq.stir.V1_0.class);
       }
   }

src/java/m/sq/Constants.java

 @@ -13,8 +13,12 @@
       //sci
       public static final String KEY_EROSION_WATER = "erosion_water";
++    public static final String KEY_WATER_OM = "water_om";
++    public static final String KEY_WATER_FO = "water_fo";
       public static final String KEY_SCI_WATER = "sci_water";
       public static final String KEY_EROSION_WIND = "erosion_wind";
++    public static final String KEY_WIND_OM = "wind_om";
++    public static final String KEY_WIND_FO = "wind_fo";
       public static final String KEY_SCI_WIND = "sci_wind";
       public static final String KEY_SCI_TOTAL = "sci_total";