From dd15702ca608d9da210dfeea5a5308da9537485b Mon Sep 17 00:00:00 2001 From: bancika Date: Mon, 8 Oct 2012 14:31:03 +0000 Subject: [PATCH] do not hard-code version in presenter --- .../diylc-core/library/main.jar | Bin 258232 -> 258233 bytes .../src/org/diylc/presenter/Presenter.java | 31 +++++++++++++++--- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar index e1301278e49284de08cf23399bbd827a955e3f2f..05009e7dea427826a1ea7bfac23ba767d3a91f0c 100644 GIT binary patch delta 5812 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 delta 5836 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 M;9H$sja8rYKNEKirT_o{ diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java index e8906587..a58f011c 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java @@ -8,8 +8,12 @@ import java.awt.Rectangle; import java.awt.dnd.DnDConstants; import java.awt.geom.Area; import java.awt.geom.Point2D; +import java.io.BufferedInputStream; import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; import java.lang.reflect.Modifier; +import java.net.URL; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -28,6 +32,7 @@ import org.apache.log4j.Logger; import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.appframework.miscutils.Utils; import org.diylc.appframework.simplemq.MessageDispatcher; +import org.diylc.appframework.update.Version; import org.diylc.appframework.update.VersionNumber; import org.diylc.common.ComponentType; import org.diylc.common.DrawOption; @@ -47,6 +52,9 @@ import org.diylc.core.Theme; import org.diylc.core.measures.SizeUnit; import org.diylc.utils.Constants; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; + /** * The main presenter class, contains core app logic and drawing routines. * @@ -56,8 +64,21 @@ public class Presenter implements IPlugInPort { private static final Logger LOG = Logger.getLogger(Presenter.class); - public static final VersionNumber CURRENT_VERSION = new VersionNumber(3, - 22, 0); + public static VersionNumber CURRENT_VERSION = new VersionNumber(3, 0, 0); + // Read the latest version from the local update.xml file + static { + try { + BufferedInputStream in = new BufferedInputStream( + new FileInputStream("update.xml")); + XStream xStream = new XStream(new DomDriver()); + List allVersions = (List) xStream.fromXML(in); + in.close(); + CURRENT_VERSION = allVersions.get(allVersions.size() - 1) + .getVersionNumber(); + } catch (IOException e) { + LOG.error("Could not find version number, using default", e); + } + } public static final String DEFAULTS_KEY_PREFIX = "default."; public static final List> EMPTY_SELECTION = Collections @@ -1773,8 +1794,8 @@ public class Presenter implements IPlugInPort { } } List points = new ArrayList(); - - for (int i = 0; i< component.getControlPointCount(); i++) { + + for (int i = 0; i < component.getControlPointCount(); i++) { Point p = new Point(component.getControlPoint(i)); points.add(p); } @@ -1783,7 +1804,7 @@ public class Presenter implements IPlugInPort { for (Point point : points) { point.translate(-x, -y); } - + Template template = new Template(templateName, values, points); boolean exists = false; for (Template t : templates) {