Changeset 487 in tmcsimulator

Timestamp:

10/15/2019 05:00:50 PM (7 years ago)

Author:

jdalbey

Message:

PizzaOrderIntl? change project properties to not use JUnit, solving the inconsistent libraries problem. Fix the unchecked exception compile error.

Location:

branches/SVNtutorial/PizzaOrderIntl

Files:

• nbproject/project.properties (modified) (2 diffs)
• src/pizzaorder/GUI.form (modified) (3 diffs)
• src/pizzaorder/GUI.java (modified) (2 diffs)
• uispec4j-2.4-javadoc.jar (deleted)
• uispec4j-jdk17.jar (deleted)

branches/SVNtutorial/PizzaOrderIntl/nbproject/project.properties

@@ -1 @@
-#Tue Oct 15 18:16:37 PDT 2019
+#Tue Oct 15 18:27:22 PDT 2019
 excludes=
 javac.deprecation=false
 build.test.results.dir=${build.dir}/test/results
-run.classpath=${javac.classpath}\:${build.classes.dir}
+javac.external.vm=false
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
 javadoc.nonavbar=false
-run.test.classpath=${javac.test.classpath}\:${build.test.classes.dir}
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-javac.processorpath=${javac.classpath}
+javac.processorpath=\
+    ${javac.classpath}
 javac.target=1.7
 annotation.processing.processors.list=
@@ -34 +40 @@
 javac.source=1.7
 application.vendor=jdalbey
-junit.selected.version=4
+junit.selected.version=3
 debug.classpath=${run.classpath}
 run.jvmargs=
-build.generated.dir=${build.dir}/generated
-jar.compress=false
 javac.test.classpath=\
     ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit_4.classpath}:\
-    ${libs.hamcrest.classpath}
+    ${build.classes.dir}
+jar.compress=false
+build.generated.dir=${build.dir}/generated
 javadoc.private=false
 annotation.processing.run.all.processors=true
 application.title=PizzaOrderIntl
 meta.inf.dir=${src.dir}/META-INF
+annotation.processing.enabled=true
 manifest.file=manifest.mf
-annotation.processing.enabled=true
 dist.javadoc.dir=${dist.dir}/javadoc
 src.dir=src
+endorsed.classpath=
 mkdist.disabled=false
-endorsed.classpath=
-javac.classpath=${libs.junit.classpath}\:${libs.junit_4.classpath}
 annotation.processing.enabled.in.editor=false
+javac.classpath=
 build.generated.sources.dir=${build.dir}/generated-sources
 javadoc.version=false

branches/SVNtutorial/PizzaOrderIntl/src/pizzaorder/GUI.form

@@ -1 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
@@ -45 +45 @@
     <SyntheticProperty name="menuBar" type="java.lang.String" value="menubar"/>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <AuxValues>
@@ -153 +154 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="comboLocaleActionPerformed"/>
               </Events>
+              <AuxValues>
+                <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
+              </AuxValues>
             </Component>
           </SubComponents>

branches/SVNtutorial/PizzaOrderIntl/src/pizzaorder/GUI.java

@@ -55 +55 @@
         jPanel2 = new javax.swing.JPanel();
         lblLocale = new javax.swing.JLabel();
-        comboLocale = new javax.swing.JComboBox();
+        comboLocale = new javax.swing.JComboBox<>();
         jPanel3 = new javax.swing.JPanel();
         lblToppings = new javax.swing.JLabel();
@@ -357 +357 @@
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton btnSubmit;
-    private javax.swing.JComboBox comboLocale;
+    private javax.swing.JComboBox<String> comboLocale;
     private javax.swing.JCheckBox jCheckBox1;
     private javax.swing.JCheckBox jCheckBox2;