Merge origin/master

CourseExamples/nbproject/genfiles.properties

-build.xml.data.CRC32=ba18aca8
+build.xml.data.CRC32=3397fc52
 build.xml.script.CRC32=f4fc0484
 build.xml.stylesheet.CRC32=8064a381@1.80.1.48
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=ba18aca8
+nbproject/build-impl.xml.data.CRC32=3397fc52
 nbproject/build-impl.xml.script.CRC32=6a5b91f6
 nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48

CourseExamples/src/DisExamples/PduSender.java

@@ -73,6 +73,9 @@ public class PduSender
                         
                     case COMMENT:
                         aPdu = new CommentPdu();
+						CommentPdu    newCommentPdu = (CommentPdu)aPdu;
+						VariableDatum newVariableDatum = new VariableDatum();
+						// etc. see Garrett and Pete's code
                         break;
 
                     case FIRE:

CourseExamples/src/TcpExamples/TcpExample3Server.java

@@ -31,7 +31,7 @@ public class TcpExample3Server {
 			// Notice that it is outside the loop; ServerSocket
 			// needs to be made only once.
 
-			System.out.println("TcpExample3Server has started..."); // it helps debugging to put this on console first
+			System.out.println("TcpExample3Server has really started..."); // it helps debugging to put this on console first
 			ServerSocket serverSocket = new ServerSocket(2317);
 
 			// Server is up and waiting (i.e. "blocked" or paused)
@@ -62,7 +62,7 @@ public class TcpExample3Server {
 				//
 				// Why is the first IP/port the same, while the second set has
 				// different ports?
-				System.out.println("Socket pair: (( " + localAddress.toString() + ", " + localPort + " ), ( "
+				System.out.println("TcpExample3Server socket pair: (( " + localAddress.toString() + ", " + localPort + " ), ( "
 						+ remoteAddress.toString() + ", " + remotePort + " ))");
 
 				// Notice the use of flush() and close(). Without

CourseExamples/src/TcpExamples/TcpExample3TerminalLog.txt

@@ -7,9 +7,9 @@ Program responses:
 ===================================================
 run:
 TcpExample3Server has started...
-Socket pair: (( /0:0:0:0:0:0:0:1, 2317 ), ( /0:0:0:0:0:0:0:1, 49239 ))
-Socket pair: (( /0:0:0:0:0:0:0:1, 2317 ), ( /0:0:0:0:0:0:0:1, 49240 ))
-Socket pair: (( /0:0:0:0:0:0:0:1, 2317 ), ( /0:0:0:0:0:0:0:1, 49241 ))
+TcpExample3Server socket pair: (( /0:0:0:0:0:0:0:1, 2317 ), ( /0:0:0:0:0:0:0:1, 49239 ))
+TcpExample3Server socket pair: (( /0:0:0:0:0:0:0:1, 2317 ), ( /0:0:0:0:0:0:0:1, 49240 ))
+TcpExample3Server socket pair: (( /0:0:0:0:0:0:0:1, 2317 ), ( /0:0:0:0:0:0:0:1, 49241 ))
 [etc.]
 [kill process to exit]
 
@@ -30,3 +30,7 @@ The message the server sent was This was written by the server
 TcpExample3Client creating socket...
 ==================================================
 [etc.]
+
+You must kill this process to get it to stop, each is in an infinite loop.
+
+If you kill the server, that will kill the client automatically when the connection drops.

deliverables/src/MV3500Cohort2018JulySeptember/FinalProjects/README.md

@@ -5,3 +5,10 @@ Create a dedicated subdirectory for each individual or team project.
 Example:  `SmithJones`
 
 See the [course syllabus](../../../../MV3500NetworkedGraphicsSyllabus2018JulySeptember.pdf) for details on how to document your project.
+
+Typical final project deliverables:
+* README.md providing a basic description of goals, running the project, files, etc.
+* Source code, screen shots, console text log, and any other assets
+* Powerpoint presentation, video capture (if you want)
+
+These deliverables have great value going forward.  Questions welcome, keep going!

deliverables/src/MV3500Cohort2018JulySeptember/homework2/Demchko/DemchkoServer.java

@@ -55,7 +55,7 @@ public class DemchkoServer {
 				//
 				// Why is the first IP/port the same, while the second set has
 				// different ports?
-				System.out.println("Socket pair: (( " + localAddress.toString() + ", " + localPort + " ), ( "
+				System.out.println("Socket pair: (( " + localAddress.toString().trim() + ", " + localPort + " ), ( "
 						+ remoteAddress.toString() + ", " + remotePort + " ))");
                                 
                                 InputStream is = clientConnection.getInputStream();

nbproject/project.xml

@@ -18,12 +18,22 @@ auxiliary.show.customizer.message=<message>
                 <source-folder>
                     <label>Networked Graphics MV3500</label>
                     <location>.</location>
-                    <encoding>UTF-8</encoding>
+                    <encoding>windows-1252</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>lib</label>
+                    <type>java</type>
+                    <location>lib</location>
+                    <encoding>windows-1252</encoding>
                 </source-folder>
             </folders>
             <ide-actions/>
             <view>
                 <items>
+                    <source-folder style="packages">
+                        <label>lib</label>
+                        <location>lib</location>
+                    </source-folder>
                     <source-file>
                         <location>build.xml</location>
                     </source-file>
@@ -32,7 +42,12 @@ auxiliary.show.customizer.message=<message>
             </view>
             <subprojects/>
         </general-data>
-        <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1"/>
+        <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
+            <compilation-unit>
+                <package-root>lib</package-root>
+                <source-level>1.5</source-level>
+            </compilation-unit>
+        </java-data>
         <spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1">
             <word>codebases</word>
             <word>DIS</word>
@@ -40,6 +55,7 @@ auxiliary.show.customizer.message=<message>
             <word>interoperability</word>
             <word>interoperable</word>
             <word>TENA</word>
+            <word>Wikipedia</word>
         </spellchecker-wordlist>
     </configuration>
 </project>