diff --git a/diylc/diylc-core/src/org/diylc/parsing/IOldFileParser.java b/diylc/diylc-core/src/org/diylc/serialization/IOldFileParser.java similarity index 95% rename from diylc/diylc-core/src/org/diylc/parsing/IOldFileParser.java rename to diylc/diylc-core/src/org/diylc/serialization/IOldFileParser.java index 93ddd015..5a7f905b 100644 --- a/diylc/diylc-core/src/org/diylc/parsing/IOldFileParser.java +++ b/diylc/diylc-core/src/org/diylc/serialization/IOldFileParser.java @@ -19,7 +19,7 @@ along with DIYLC. If not, see . */ -package org.diylc.parsing; +package org.diylc.serialization; import java.util.List; diff --git a/diylc/diylc-core/src/org/diylc/serialization/ProjectFileManager.java b/diylc/diylc-core/src/org/diylc/serialization/ProjectFileManager.java index 21dbf49e..1e573aaf 100644 --- a/diylc/diylc-core/src/org/diylc/serialization/ProjectFileManager.java +++ b/diylc/diylc-core/src/org/diylc/serialization/ProjectFileManager.java @@ -47,7 +47,6 @@ import org.diylc.appframework.simplemq.MessageDispatcher; import org.diylc.appframework.update.VersionNumber; import org.diylc.common.EventType; import org.diylc.core.Project; -import org.diylc.parsing.IOldFileParser; import org.diylc.presenter.Presenter; import org.diylc.test.DIYTest; import org.w3c.dom.Document; diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index 1b61087a..08ccc7e0 100644 Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ diff --git a/diylc/diylc-library/src/org/diylc/parsing/V1FileParser.java b/diylc/diylc-library/src/org/diylc/serialization/V1FileParser.java similarity index 97% rename from diylc/diylc-library/src/org/diylc/parsing/V1FileParser.java rename to diylc/diylc-library/src/org/diylc/serialization/V1FileParser.java index f00c1fdd..f32cc0d6 100644 --- a/diylc/diylc-library/src/org/diylc/parsing/V1FileParser.java +++ b/diylc/diylc-library/src/org/diylc/serialization/V1FileParser.java @@ -19,7 +19,7 @@ along with DIYLC. If not, see . */ -package org.diylc.parsing; +package org.diylc.serialization; import java.awt.Color; import java.awt.Point; @@ -70,7 +70,8 @@ import org.diylc.core.measures.Resistance; import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; import org.diylc.presenter.CalcUtils; -import org.diylc.presenter.ComparatorFactory; +import org.diylc.presenter.ComparatorFactory; +import org.diylc.serialization.IOldFileParser; import org.diylc.utils.Constants; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/diylc/diylc-library/src/org/diylc/parsing/V2FileParser.java b/diylc/diylc-library/src/org/diylc/serialization/V2FileParser.java similarity index 97% rename from diylc/diylc-library/src/org/diylc/parsing/V2FileParser.java rename to diylc/diylc-library/src/org/diylc/serialization/V2FileParser.java index a08a4bd1..3592333c 100644 --- a/diylc/diylc-library/src/org/diylc/parsing/V2FileParser.java +++ b/diylc/diylc-library/src/org/diylc/serialization/V2FileParser.java @@ -19,7 +19,7 @@ along with DIYLC. If not, see . */ -package org.diylc.parsing; +package org.diylc.serialization; import java.awt.Color; import java.awt.Point; @@ -77,7 +77,8 @@ import org.diylc.core.measures.Resistance; import org.diylc.core.measures.ResistanceUnit; import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; -import org.diylc.presenter.Presenter; +import org.diylc.presenter.Presenter; +import org.diylc.serialization.IOldFileParser; import org.diylc.utils.Constants; import org.nfunk.jep.JEP; import org.w3c.dom.Element; diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index 1b61087a..08ccc7e0 100644 Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index 97b5476c..ef759391 100644 Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ