move folders

diylc/diylc-swing/.classpath

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="test"/>
+	<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
+	<classpathentry kind="lib" path="lib/junit-4.7.jar"/>
+	<classpathentry kind="lib" path="lib/iText-2.1.7.jar"/>
+	<classpathentry kind="lib" path="lib/jettison-1.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/poi-3.5-FINAL-20090928.jar"/>
+	<classpathentry kind="lib" path="library/main.jar" sourcepath="/diylc-library"/>
+	<classpathentry kind="lib" path="lib/app-framework.jar"/>
+	<classpathentry kind="lib" path="lib/swing-framework.jar"/>
+	<classpathentry kind="lib" path="lib/bancika-http-proxy.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/diylc-core"/>
+	<classpathentry kind="lib" path="lib/xstream-1.4.3.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_45"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

diylc/diylc-swing/.gitignore

@@ -0,0 +1,8 @@
+/bin/
+/.apt_generated
+/log/
+/build/
+/library/
+/lib/diylc-core.jar
+autoSave.diy
+config.xml

diylc/diylc-swing/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>diylc-swing</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

diylc/diylc-swing/DIYLCStarter.launch

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<stringAttribute key="bad_container_name" value="\DIYLC\r"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/diylc-swing/src/org/diylc/DIYLCStarter.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;Library&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;DIYLC&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_45"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.diylc.DIYLCStarter"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="diylc-swing"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx512m -Dorg.diylc.scriptRun=true -Ddorg.diylc.debugComponentAreas=true"/>
+</launchConfiguration>

diylc/diylc-swing/associations.bat

@@ -0,0 +1,2 @@
+ftype diyfile="%CD%\diylc.exe" "%%1"
+assoc .diy=diyfile

diylc/diylc-swing/build.xml

@@ -0,0 +1,121 @@
+<project name="diylc-swing" basedir="." default="complete">
+
+	<property name="src.dir" value="src" />
+
+	<property name="lib.dir" value="${basedir}/lib" />
+	<property name="build.dir" value="${basedir}/build" />
+	<property name="jar.dir" value="${build.dir}/jar" />
+	<property name="report.dir" value="${build.dir}/junitreport" />
+	<property name="main.class" value="org.diylc.DIYLCStarter" />
+	<property name="diylc.version" value="3.31.0" />
+
+	<property name="classes.dir" value="${build.dir}/temp/${ant.project.name}/classes" />
+	<property name="test.classes.dir" value="${build.dir}/temp/${ant.project.name}/test.classes" />
+
+	<target name="clean">
+		<delete dir="${build.dir}" />
+	</target>
+
+	<!--change src dir-->
+	<target name="compile">
+		<ant antfile="../diylc-library/build.xml" target="jar" inheritAll="false" />
+		<mkdir dir="${classes.dir}" />
+		<echo>Compile with JDK ${java.runtime.version}</echo>
+		<javac encoding="8859_1" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="class.path">
+			<compilerarg value="-proc:none" />
+		</javac>
+	</target>
+
+	<target name="resource.copy">
+		<copy todir="${classes.dir}">
+			<fileset dir="${src.dir}">
+				<exclude name="**/*.java" />
+			</fileset>
+		</copy>
+	</target>
+
+	<target name="lib.copy">
+		<copy todir="${jar.dir}/lib" overwrite="true">
+			<fileset dir="${basedir}/lib">
+				<exclude name="**/*dll" />
+			</fileset>
+		</copy>
+		<copy todir="${jar.dir}/library" overwrite="true">
+			<fileset dir="${basedir}/library">
+				<exclude name="**/*dll" />
+			</fileset>
+		</copy>
+		<copy todir="${jar.dir}" overwrite="true">
+			<fileset dir="${basedir}/lib/" includes="**/*.dll" />
+		</copy>
+	</target>
+
+	<path id="class.path">
+		<fileset dir="${basedir}">
+			<include name="lib/**/*.jar" />
+			<include name="library/**/*.jar" />
+		</fileset>
+	</path>
+
+	<manifestclasspath jarfile="${ant.project.name}.jar" property="manifest.class.path">
+		<classpath refid="class.path" />
+	</manifestclasspath>
+
+	<target name="jar" depends="clean, lib.copy, resource.copy, compile">
+		<jar destfile="${jar.dir}/diylc.jar" basedir="${classes.dir}">
+			<manifest>
+				<attribute name="Built-By" value="${user.name}" />
+				<attribute name="Main-Class" value="${main.class}" />
+				<attribute name="Class-Path" value="${manifest.class.path}" />
+			</manifest>
+		</jar>
+	</target>
+
+	<target name="mac" depends="jar">
+		<taskdef name="jarbundler" classname="net.sourceforge.jarbundler.JarBundler" />
+		<jarbundler bundleid="org.diylc" dir="${jar.dir}" name="DIYLC" version="${diylc.version}" mainclass="${main.class}" stubfile="JavaApplicationStub" vmoptions="-Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true" icon="icons/diylc.icns" workingdirectory="$APP_PACKAGE/Contents/Resources" infostring="DIY Layout Creator by bancika (diy-fever.com)">
+			<jarfileset dir="${jar.dir}">
+				<include name="diylc.jar" />
+				<include name="lib/**/*.jar" />
+				<include name="library/**/*.jar" />
+			</jarfileset>
+			<resourcefileset dir="${basedir}">
+				<include name="update.xml" />
+				<include name="templates**/*.diy" />
+				<include name="themes**/*.xml" />
+			</resourcefileset>
+			<javaproperty name="apple.laf.useScreenMenuBar" value="true" />
+			<!--<documenttype name="DIYLC Project"
+			                    extensions="diylc" 
+			                    role="Editor"/>-->
+		</jarbundler>
+	</target>
+
+	<target name="complete" depends="mac">
+		<zip destfile="${build.dir}/diylc-${diylc.version}.zip">
+			<zipfileset dir="${jar.dir}" includes="diylc.jar" />
+			<zipfileset dir="${jar.dir}/lib" prefix="lib" />
+			<zipfileset dir="${jar.dir}/library/" prefix="library" />
+			<zipfileset dir="templates" prefix="templates" />
+			<zipfileset dir="themes" prefix="themes" />
+			<zipfileset dir="." includes="update.xml" />
+			<zipfileset dir="." includes="run.sh" />
+			<zipfileset dir="." includes="diylc.l4j.ini" />
+			<zipfileset dir="." includes="associations.bat" />
+			<zipfileset dir="." includes="diylc.exe" />
+		</zip>
+		<zip destfile="${build.dir}/diylc-${diylc.version}-osx.zip">
+			<zipfileset filemode="755" dir="${jar.dir}/DIYLC.app" prefix="DIYLC.app" />
+		</zip>
+	</target>
+
+	<target name="javadoc">
+		<javadoc access="public" author="true" classpathref="class.path" destdir="doc" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.6" splitindex="true" use="true" version="true">
+			<fileset dir="${src.dir}">
+				<exclude name="**\.svn\**" />
+				<include name="**/*.java" />
+			</fileset>
+		</javadoc>
+	</target>
+
+</project>

diylc/diylc-swing/config.properties

@@ -0,0 +1,4 @@
+# Uncomment lines you want to edit and change the part after the "=" sign.
+#org.diylc.presenter.InstantiationManager.MAX_RECENT_COMPONENTS=20
+#org.diylc.swing.plugins.canvas.CanvasPanel.USE_HARDWARE_ACCELLERATION=true
+#org.diylc.swing.gui.editor.PropertyEditorDialog.SHOW_DEFAULT_BOXES=true

diylc/diylc-swing/diylc.l4j.ini

@@ -0,0 +1 @@
+-Xms512m -Xmx1024m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8

diylc/diylc-swing/run.sh

@@ -0,0 +1 @@
+java -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp diylc.jar:lib org.diylc.DIYLCStarter

diylc/diylc-swing/src/org/diylc/DIYLCStarter.java

@@ -0,0 +1,99 @@
+package org.diylc;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Properties;
+
+import javax.swing.JOptionPane;
+import javax.swing.UIManager;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.PropertyConfigurator;
+import org.diylc.appframework.miscutils.ConfigurationManager;
+import org.diylc.appframework.miscutils.PropertyInjector;
+import org.diylc.appframework.miscutils.Utils;
+import org.diylc.presenter.Presenter;
+import org.diylc.swing.gui.MainFrame;
+import org.diylc.swing.gui.TemplateDialog;
+
+/**
+ * Main class that runs DIYLC.
+ * 
+ * @author Branislav Stojkovic
+ * 
+ * @see Presenter
+ * @see MainFrame
+ */
+public class DIYLCStarter {
+
+  private static final Logger LOG = Logger.getLogger(DIYLCStarter.class);
+
+  private static final String SCRIPT_RUN = "org.diylc.scriptRun";
+
+  /**
+   * @param args
+   */
+  public static void main(String[] args) {
+    URL url = DIYLCStarter.class.getResource("log4j.properties");
+    Properties properties = new Properties();
+    try {
+      properties.load(url.openStream());
+      PropertyConfigurator.configure(properties);
+    } catch (Exception e) {
+      LOG.error("Could not initialize log4j configuration", e);
+    }
+
+    LOG.debug("Java version: " + System.getProperty("java.runtime.version") + " by "
+        + System.getProperty("java.vm.vendor"));
+    LOG.debug("OS: " + System.getProperty("os.name") + " " + System.getProperty("os.version"));
+
+    LOG.info("Starting DIYLC with working directory " + System.getProperty("user.dir"));
+
+    try {
+      UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+    } catch (Exception e) {
+      LOG.error("Could not set Look&Feel", e);
+    }
+
+    String val = System.getProperty(SCRIPT_RUN);
+    if (!"true".equals(val)) {
+      int response =
+          JOptionPane.showConfirmDialog(null, "It is not recommended to run DIYLC by clicking on the diylc.jar file.\n"
+              + "Please use diylc.exe on Windows or run.sh on OSX/Linux to ensure the best\n"
+              + "performance and reliability. Do you want to continue?", "DIYLC", JOptionPane.YES_NO_OPTION,
+              JOptionPane.WARNING_MESSAGE);
+      if (response != JOptionPane.YES_OPTION) {
+        System.exit(0);
+      }
+    }
+
+    MainFrame mainFrame = new MainFrame();
+    mainFrame.setLocationRelativeTo(null);
+    mainFrame.setVisible(true);
+    if (args.length > 0) {
+      mainFrame.getPresenter().loadProjectFromFile(args[0]);
+    } else {
+      boolean showTemplates = ConfigurationManager.getInstance().readBoolean(TemplateDialog.SHOW_TEMPLATES_KEY, true);
+      if (showTemplates) {
+        TemplateDialog templateDialog = new TemplateDialog(mainFrame, mainFrame.getPresenter());
+        if (!templateDialog.getFiles().isEmpty()) {
+          templateDialog.setVisible(true);
+        }
+      }
+    }
+
+    properties = new Properties();
+    try {
+      LOG.info("Injecting default properties.");
+      File f = new File("config.properties");
+      if (f.exists()) {
+        properties.load(new FileInputStream(f));
+        PropertyInjector.injectProperties(properties);
+      }
+    } catch (Exception e) {
+      LOG.error("Could not read config.properties file", e);
+    }
+  }
+}

diylc/diylc-swing/src/org/diylc/images/IconLoader.java

@@ -0,0 +1,62 @@
+package org.diylc.images;
+
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+
+/**
+ * Loads image resources as Icons.
+ * 
+ * @author Branislav Stojkovic
+ */
+public enum IconLoader {
+
+  Delete("delete.png"), Add("add.png"), FolderOut("folder_out.png"), Garbage("garbage.png"), DiskBlue("disk_blue.png"), SaveAs(
+      "save_as.png"), Exit("exit.png"), DocumentPlainYellow("document_plain_yellow.png"), PhotoScenery(
+      "photo_scenery.png"), LightBulbOn("lightbulb_on.png"), LightBulbOff("lightbulb_off.png"), NotebookAdd(
+      "notebook_add.png"), FormGreen("form_green.png"), Gears("gears.png"), About("about.png"), WindowColors(
+      "window_colors.png"), WindowGear("window_gear.png"), NavigateCheck("navigate_check.png"), Undo("undo.png"), Error(
+      "error.png"), Warning("warning.png"), ZoomSmall("zoom_small.png"), MoveSmall("move_small.png"), Print("print.png"), PDF(
+      "pdf.png"), Excel("excel.png"), CSV("csv.png"), HTML("html.png"), Image("image.png"), Cut("cut.png"), Copy(
+      "copy.png"), Paste("paste.png"), Selection("selection.png"), BOM("bom.png"), BlackBoard("blackboard.png"), IdCard(
+      "id_card.png"), IdCardAdd("id_card_add.png"), Chest("chest.png"), Upload("upload.png"), Wrench("wrench.png"), Group(
+      "group.png"), Ungroup("ungroup.png"), TraceMask("trace_mask.png"), Faq("faq.png"), Component("component.png"), Plugin(
+      "plugin.png"), Manual("manual.png"), Donate("donate.png"), Bug("bug.png"), IconLarge("icon_large.png"), IconMedium(
+      "icon_medium.png"), IconSmall("icon_small.png"), DocumentEdit("document_edit.png"), EditComponent(
+      "edit_component.png"), Size("size.png"), Front("front.png"), Back("back.png"), Pens("pens.png"), Sort("sort.png"), ElementsSelection(
+      "elements_selection.png"), BranchAdd("branch_add.png"), BriefcaseAdd("briefcase_add.png"), BriefcaseInto(
+      "briefcase_into.png"), RotateCW("rotate_cw.png"), RotateCCW("rotate_ccw.png"), ElementInto("element_into.png"), Arrow(
+      "arrow.png"), Cloud("cloud.png"), CloudUp("cloud_up.png"), CloudGear("cloud_gear.png"), IdCardEdit(
+      "id_card_edit.png"), KeyEdit("key_edit.png"), Find("find.png"), Dashboard("dashboard.png"), DataFind(
+      "data_find.png"), CloudDownload("cloud-download.png");
+
+  protected String name;
+
+  private IconLoader(String name) {
+    this.name = name;
+  }
+
+  public Icon getIcon() {
+    java.net.URL imgURL = getClass().getResource(name);
+    if (imgURL != null) {
+      return new ImageIcon(imgURL, name);
+    } else {
+      System.err.println("Couldn't find file: " + name);
+      return null;
+    }
+  }
+
+  public Image getImage() {
+    BufferedImage img = null;
+    try {
+      img = ImageIO.read(getClass().getResourceAsStream(name));
+    } catch (IOException e) {
+      System.err.println("Couldn't find file: " + name);
+    }
+    return img;
+  }
+}