From 213aba8b5700f8397e7d9fcba5ac850734dc36bf Mon Sep 17 00:00:00 2001
From: David Livingstone <d.livingstone@kingston.ac.uk>
Date: Sun, 5 Jan 2025 23:00:39 +0000
Subject: [PATCH] restructuring the repo so that the net beans project is at
 the same level as the repository - to make it easier to version manage the
 files using the netBeans git tools

---
 SwingCodeExamplesNB/pom.xml => pom.xml                        | 4 ++--
 .../main/java/javateaching/basicgui/BasicGUITest.java         | 0
 .../main/java/javateaching/basicgui/BorderLayoutDemo.java     | 0
 .../main/java/javateaching/basicgui/ComboLayout.java          | 0
 .../src => src}/main/java/javateaching/basicgui/Demo.java     | 0
 .../main/java/javateaching/basicgui/GridLayoutTest.java       | 0
 .../src => src}/main/java/javateaching/basicgui/LeanGui.java  | 0
 .../main/java/javateaching/basicgui/LeanGuiWithScroll.java    | 0
 .../main/java/javateaching/guimoar/FlowLayoutExample.java     | 0
 .../main/java/javateaching/guimoar/GridLayoutExample.java     | 0
 .../src => src}/main/java/javateaching/guimoar/GridTo500.java | 0
 .../main/java/javateaching/guimoar/MixAndMatchDemo.java       | 0
 .../main/java/javateaching/guimoar/MixAndMatchWindow.java     | 0
 .../java/javateaching/layoutmanagers/BorderLayoutExample.java | 0
 .../main/java/javateaching/layoutmanagers/Cat.java            | 0
 .../java/javateaching/layoutmanagers/CombiningLayouts.java    | 0
 .../java/javateaching/layoutmanagers/ComponentShowcase.java   | 0
 .../java/javateaching/layoutmanagers/ConstructorDemo.java     | 0
 .../main/java/javateaching/layoutmanagers/Controller.java     | 0
 .../java/javateaching/layoutmanagers/FlowLayoutExample.java   | 0
 .../java/javateaching/layoutmanagers/GridLayoutExample.java   | 0
 .../main/java/javateaching/layoutmanagers/GridTo500.java      | 0
 .../main/java/javateaching/layoutmanagers/LayoutManagers.java | 0
 .../java/javateaching/layoutmanagers/MigLayoutExample.java    | 0
 .../main/java/javateaching/layoutmanagers/ScrollPaneDemo.java | 0
 .../main/java/javateaching/leanconsole/GCDemo.java            | 0
 .../main/java/javateaching/leanconsole/LeanConsole.java       | 0
 .../java/javateaching/leanconsole/LeanConsoleWithInput.java   | 0
 .../src => src}/main/java/singletonexample/MySingleton.java   | 0
 .../main/java/singletonexample/SingletonExample.java          | 0
 30 files changed, 2 insertions(+), 2 deletions(-)
 rename SwingCodeExamplesNB/pom.xml => pom.xml (87%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/basicgui/BasicGUITest.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/basicgui/BorderLayoutDemo.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/basicgui/ComboLayout.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/basicgui/Demo.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/basicgui/GridLayoutTest.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/basicgui/LeanGui.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/basicgui/LeanGuiWithScroll.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/guimoar/FlowLayoutExample.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/guimoar/GridLayoutExample.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/guimoar/GridTo500.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/guimoar/MixAndMatchDemo.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/guimoar/MixAndMatchWindow.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/layoutmanagers/BorderLayoutExample.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/layoutmanagers/Cat.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/layoutmanagers/CombiningLayouts.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/layoutmanagers/ComponentShowcase.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/layoutmanagers/ConstructorDemo.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/layoutmanagers/Controller.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/layoutmanagers/FlowLayoutExample.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/layoutmanagers/GridLayoutExample.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/layoutmanagers/GridTo500.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/layoutmanagers/LayoutManagers.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/layoutmanagers/MigLayoutExample.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/layoutmanagers/ScrollPaneDemo.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/leanconsole/GCDemo.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/leanconsole/LeanConsole.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/javateaching/leanconsole/LeanConsoleWithInput.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/singletonexample/MySingleton.java (100%)
 rename {SwingCodeExamplesNB/src => src}/main/java/singletonexample/SingletonExample.java (100%)

diff --git a/SwingCodeExamplesNB/pom.xml b/pom.xml
similarity index 87%
rename from SwingCodeExamplesNB/pom.xml
rename to pom.xml
index f0155e2..a8b3282 100644
--- a/SwingCodeExamplesNB/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
   </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 </project>
\ No newline at end of file
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/basicgui/BasicGUITest.java b/src/main/java/javateaching/basicgui/BasicGUITest.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/basicgui/BasicGUITest.java
rename to src/main/java/javateaching/basicgui/BasicGUITest.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/basicgui/BorderLayoutDemo.java b/src/main/java/javateaching/basicgui/BorderLayoutDemo.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/basicgui/BorderLayoutDemo.java
rename to src/main/java/javateaching/basicgui/BorderLayoutDemo.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/basicgui/ComboLayout.java b/src/main/java/javateaching/basicgui/ComboLayout.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/basicgui/ComboLayout.java
rename to src/main/java/javateaching/basicgui/ComboLayout.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/basicgui/Demo.java b/src/main/java/javateaching/basicgui/Demo.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/basicgui/Demo.java
rename to src/main/java/javateaching/basicgui/Demo.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/basicgui/GridLayoutTest.java b/src/main/java/javateaching/basicgui/GridLayoutTest.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/basicgui/GridLayoutTest.java
rename to src/main/java/javateaching/basicgui/GridLayoutTest.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/basicgui/LeanGui.java b/src/main/java/javateaching/basicgui/LeanGui.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/basicgui/LeanGui.java
rename to src/main/java/javateaching/basicgui/LeanGui.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/basicgui/LeanGuiWithScroll.java b/src/main/java/javateaching/basicgui/LeanGuiWithScroll.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/basicgui/LeanGuiWithScroll.java
rename to src/main/java/javateaching/basicgui/LeanGuiWithScroll.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/guimoar/FlowLayoutExample.java b/src/main/java/javateaching/guimoar/FlowLayoutExample.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/guimoar/FlowLayoutExample.java
rename to src/main/java/javateaching/guimoar/FlowLayoutExample.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/guimoar/GridLayoutExample.java b/src/main/java/javateaching/guimoar/GridLayoutExample.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/guimoar/GridLayoutExample.java
rename to src/main/java/javateaching/guimoar/GridLayoutExample.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/guimoar/GridTo500.java b/src/main/java/javateaching/guimoar/GridTo500.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/guimoar/GridTo500.java
rename to src/main/java/javateaching/guimoar/GridTo500.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/guimoar/MixAndMatchDemo.java b/src/main/java/javateaching/guimoar/MixAndMatchDemo.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/guimoar/MixAndMatchDemo.java
rename to src/main/java/javateaching/guimoar/MixAndMatchDemo.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/guimoar/MixAndMatchWindow.java b/src/main/java/javateaching/guimoar/MixAndMatchWindow.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/guimoar/MixAndMatchWindow.java
rename to src/main/java/javateaching/guimoar/MixAndMatchWindow.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/BorderLayoutExample.java b/src/main/java/javateaching/layoutmanagers/BorderLayoutExample.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/BorderLayoutExample.java
rename to src/main/java/javateaching/layoutmanagers/BorderLayoutExample.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/Cat.java b/src/main/java/javateaching/layoutmanagers/Cat.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/Cat.java
rename to src/main/java/javateaching/layoutmanagers/Cat.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/CombiningLayouts.java b/src/main/java/javateaching/layoutmanagers/CombiningLayouts.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/CombiningLayouts.java
rename to src/main/java/javateaching/layoutmanagers/CombiningLayouts.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/ComponentShowcase.java b/src/main/java/javateaching/layoutmanagers/ComponentShowcase.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/ComponentShowcase.java
rename to src/main/java/javateaching/layoutmanagers/ComponentShowcase.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/ConstructorDemo.java b/src/main/java/javateaching/layoutmanagers/ConstructorDemo.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/ConstructorDemo.java
rename to src/main/java/javateaching/layoutmanagers/ConstructorDemo.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/Controller.java b/src/main/java/javateaching/layoutmanagers/Controller.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/Controller.java
rename to src/main/java/javateaching/layoutmanagers/Controller.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/FlowLayoutExample.java b/src/main/java/javateaching/layoutmanagers/FlowLayoutExample.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/FlowLayoutExample.java
rename to src/main/java/javateaching/layoutmanagers/FlowLayoutExample.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/GridLayoutExample.java b/src/main/java/javateaching/layoutmanagers/GridLayoutExample.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/GridLayoutExample.java
rename to src/main/java/javateaching/layoutmanagers/GridLayoutExample.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/GridTo500.java b/src/main/java/javateaching/layoutmanagers/GridTo500.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/GridTo500.java
rename to src/main/java/javateaching/layoutmanagers/GridTo500.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/LayoutManagers.java b/src/main/java/javateaching/layoutmanagers/LayoutManagers.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/LayoutManagers.java
rename to src/main/java/javateaching/layoutmanagers/LayoutManagers.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/MigLayoutExample.java b/src/main/java/javateaching/layoutmanagers/MigLayoutExample.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/MigLayoutExample.java
rename to src/main/java/javateaching/layoutmanagers/MigLayoutExample.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/ScrollPaneDemo.java b/src/main/java/javateaching/layoutmanagers/ScrollPaneDemo.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/layoutmanagers/ScrollPaneDemo.java
rename to src/main/java/javateaching/layoutmanagers/ScrollPaneDemo.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/leanconsole/GCDemo.java b/src/main/java/javateaching/leanconsole/GCDemo.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/leanconsole/GCDemo.java
rename to src/main/java/javateaching/leanconsole/GCDemo.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/leanconsole/LeanConsole.java b/src/main/java/javateaching/leanconsole/LeanConsole.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/leanconsole/LeanConsole.java
rename to src/main/java/javateaching/leanconsole/LeanConsole.java
diff --git a/SwingCodeExamplesNB/src/main/java/javateaching/leanconsole/LeanConsoleWithInput.java b/src/main/java/javateaching/leanconsole/LeanConsoleWithInput.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/javateaching/leanconsole/LeanConsoleWithInput.java
rename to src/main/java/javateaching/leanconsole/LeanConsoleWithInput.java
diff --git a/SwingCodeExamplesNB/src/main/java/singletonexample/MySingleton.java b/src/main/java/singletonexample/MySingleton.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/singletonexample/MySingleton.java
rename to src/main/java/singletonexample/MySingleton.java
diff --git a/SwingCodeExamplesNB/src/main/java/singletonexample/SingletonExample.java b/src/main/java/singletonexample/SingletonExample.java
similarity index 100%
rename from SwingCodeExamplesNB/src/main/java/singletonexample/SingletonExample.java
rename to src/main/java/singletonexample/SingletonExample.java