From 3e172218a6086b2b666309af8f59a4b214f0c686 Mon Sep 17 00:00:00 2001
From: "pro.boooooo" <pro.boudjemline@gmail.com>
Date: Mon, 16 Jan 2023 00:19:12 +0100
Subject: [PATCH] $

---
 Makefile                | 49 +++++++++-------------
 src/.idea/workspace.xml | 90 -----------------------------------------
 2 files changed, 20 insertions(+), 119 deletions(-)
 delete mode 100644 src/.idea/workspace.xml

diff --git a/Makefile b/Makefile
index d402fa1..a5374a8 100644
--- a/Makefile
+++ b/Makefile
@@ -2,42 +2,33 @@
 JAVA = java
 JAVAC = javac
 JAVADOC = javadoc
-OPTIONSDOCS = -d docs -private -public -protected -noqualifier all
-OPTIONS = -d build -Xlint:unchecked -Xlint:deprecation
+OPTIONSDOCS = -d docs -noqualifier all
+OPTIONS = -d build/fr/sae/JSonInspector -Xlint:unchecked -Xlint:deprecation
 EXT = .java
 
 # CHEMINS
-SRC = src/
-BUILD = build/
+SRC = src/fr/sae/JSonInspector
+BUILD = build/fr/sae/JSonInspector
 DOCS = docs/
-CORE = Core
-GraphicsPACKAGE = Graphics/
-GraphicsPackageType = Graphics/Type/
-ConsolePACKAGE = Console/
+CORE = Main
 
-# POUR ALLER PLUS VITE
-ALL = $(SRC)*$(EXT) $(SRC)$(ConsolePACKAGE)*$(EXT) $(SRC)$(GraphicsPACKAGE)*$(EXT) $(SRC)$(GraphicsPackageType)*$(EXT)
+# CHEMINS RELATIF AU PROJET
+EXCEPTION = ${SRCFULLPATH}/Exception
+GRAPHICS = ${SRCFULLPATH}/Graphics
+SETTINGS = ${SRCFULLPATH}/Settings
+STORAGE = ${SRCFULLPATH}/Storage
+MAIN = ${SRCFULLPATH}/Main.java
 
-# LE FICHIER JSON (Pour mon test)
-JSON = /home/bilal-linux/toFormat.json
-
-.PHONY: console graphics clean docs
-
-console:
-	make clean
-	mkdir build && mkdir docs
-	$(JAVAC) $(OPTIONS) $(ALL)
-	cd build && $(JAVA) $(CORE) $(JSON) && cd ..
-
-graphics:
-	make clean
-	mkdir build && mkdir docs
-	$(JAVAC) $(OPTIONS) $(ALL)
-	cd build && $(JAVA) $(CORE) && cd ..
+.PHONY: clean docs
 
 clean:
-	rm -rf $(BUILD) && rm -rf $(DOCS)
+	rm -rf ${BUILD} && rm -rf ${DOCS}
 
 docs:
-	rm -rf $(BUILD)*
-	$(JAVADOC) $(OPTIONSDOCS) $(ALL)
\ No newline at end of file
+	rm -rf ${BUILD}*
+	${JAVADOC} ${OPTIONSDOCS} ${ALL}
+
+# COMPILATION
+${build}/Exception/JsonSyntaxException.class : ${EXCEPTION}/JsonSyntaxException.java
+	${JAVAC} ${JAVAC_OPTIONS} ${EXCEPTION}/JsonSyntaxException.java
+
diff --git a/src/.idea/workspace.xml b/src/.idea/workspace.xml
deleted file mode 100644
index e25f683..0000000
--- a/src/.idea/workspace.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="69aa91be-5611-42c9-9edd-6b71bc260d1f" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/../rapport.tex" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ArrayObjectListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/Graphics/ArrayObjectListener.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CoreJSONDescriptor.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Frame.java" beforeDir="false" afterPath="$PROJECT_DIR$/Graphics/Frame.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/GraphicFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/Graphics/GraphicFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/JsonSyntaxException.java" beforeDir="false" afterPath="$PROJECT_DIR$/Exception/JsonSyntaxException.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Line.java" beforeDir="false" afterPath="$PROJECT_DIR$/Graphics/Line.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/MyJLabel.java" beforeDir="false" afterPath="$PROJECT_DIR$/Graphics/MyJLabel.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/MyJPanel.java" beforeDir="false" afterPath="$PROJECT_DIR$/Graphics/MyJPanel.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Node.java" beforeDir="false" afterPath="$PROJECT_DIR$/Storage/Node.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Other.java" beforeDir="false" afterPath="$PROJECT_DIR$/Storage/Other.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Parameters.java" beforeDir="false" afterPath="$PROJECT_DIR$/Settings/Parameters.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Tree.java" beforeDir="false" afterPath="$PROJECT_DIR$/Storage/Tree.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Type.java" beforeDir="false" afterPath="$PROJECT_DIR$/Storage/Type.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Value.java" beforeDir="false" afterPath="$PROJECT_DIR$/Storage/Value.java" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectId" id="2KNL1Ow3saeeR5uGp5TWiHuom3y" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-  </component>
-  <component name="RunManager">
-    <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="JsonInspector.Main" />
-      <module name="SAE32_2022" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="JsonInspector.Storage.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Application.Main" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="69aa91be-5611-42c9-9edd-6b71bc260d1f" name="Changes" comment="" />
-      <created>1673809886930</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1673809886930</updated>
-      <workItem from="1673809891720" duration="280000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>
\ No newline at end of file