|
From: <man...@us...> - 2010-10-11 15:10:31
|
Revision: 5913
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5913&view=rev
Author: manningr
Date: 2010-10-11 15:10:24 +0000 (Mon, 11 Oct 2010)
Log Message:
-----------
Added ability for the pre-launch application to fix the application launch line so that it contains the splash screen icon setting.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/PreLaunchHelper.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/PreLaunchHelperImpl.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/PreLaunchUpdateApplication.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/update/gui/installer/net.sourceforge.squirrel_sql.client.update.gui.installer.applicationContext.xml
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/FileUtils.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/FileUtilsImpl.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/ScriptLineFixer.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/SplashScreenFixer.java
trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/update/gui/installer/PreLaunchHelperImplIntegrationTest.java
trunk/sql12/app/src/test/resources/
trunk/sql12/app/src/test/resources/squirrel-sql.sh
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/FileUtils.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/FileUtils.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/FileUtils.java 2010-10-11 15:10:24 UTC (rev 5913)
@@ -0,0 +1,56 @@
+package net.sourceforge.squirrel_sql.client.update.gui.installer;
+
+/*
+ * Copyright (C) 2010 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Interface for file utility methods.
+ */
+public interface FileUtils
+{
+
+ /**
+ * Reads the file specified by filename and builds a list of lines, applying the line fixers specified.
+ *
+ * @param filename
+ * the name of the file to read lines from.
+ * @param lineFixers
+ * a list of fixers to apply to each line. This can be null if no line manipulation is required.
+ * @return a list of lines
+ * @throws IOException
+ * if an I/O error occurs.
+ */
+ List<String> getLinesFromFile(String filename, List<ScriptLineFixer> lineFixers)
+ throws IOException;
+
+ /**
+ * Writes the specified list of line to the specified filename. This will overrite the current contents
+ * of the file.
+ *
+ * @param filename the file to overwrite
+ * @param lines the lines to write to the file.
+ * @throws FileNotFoundException
+ */
+ void writeLinesToFile(String filename, List<String> lines) throws FileNotFoundException;
+
+}
\ No newline at end of file
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/FileUtilsImpl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/FileUtilsImpl.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/FileUtilsImpl.java 2010-10-11 15:10:24 UTC (rev 5913)
@@ -0,0 +1,75 @@
+package net.sourceforge.squirrel_sql.client.update.gui.installer;
+
+/*
+ * Copyright (C) 2010 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+public class FileUtilsImpl implements FileUtils
+{
+
+ public static String newline = System.getProperty("line.separator");
+
+ /**
+ * @see net.sourceforge.squirrel_sql.client.update.gui.installer.FileUtils#
+ * getLinesFromFile(java.lang.String, java.util.List)
+ */
+ public List<String> getLinesFromFile(String filename, List<ScriptLineFixer> lineFixers) throws IOException
+ {
+ ArrayList<String> lines = new ArrayList<String>();
+
+ BufferedReader reader = new BufferedReader(new FileReader(filename));
+ String line = null;
+
+ while ((line = reader.readLine()) != null)
+ {
+ if (lineFixers != null) {
+ for (ScriptLineFixer fixer : lineFixers)
+ {
+ line = fixer.fixLine(line);
+ }
+ }
+ lines.add(line);
+ }
+ reader.close();
+ return lines;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.client.update.gui.installer.FileUtils#
+ * writeLinesToFile(java.lang.String, java.util.List)
+ */
+ public void writeLinesToFile(String filename, List<String> lines) throws FileNotFoundException
+ {
+ PrintWriter out = new PrintWriter(new File(filename));
+ for (String outline : lines)
+ {
+ out.write(outline);
+ out.write(newline);
+ }
+ out.close();
+ }
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/PreLaunchHelper.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/PreLaunchHelper.java 2010-10-11 15:07:21 UTC (rev 5912)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/PreLaunchHelper.java 2010-10-11 15:10:24 UTC (rev 5913)
@@ -18,6 +18,8 @@
*/
package net.sourceforge.squirrel_sql.client.update.gui.installer;
+import java.io.IOException;
+
/**
* Interface for the class that does the heavy lifting with regard to checking for and installing any updates
* prior to launching the application.
@@ -38,4 +40,11 @@
*/
void restoreFromBackup();
+ /**
+ * Updates the launch script with changes made necessary by the new release.
+ *
+ * @throws IOException if an I/O error occurs
+ */
+ public void updateLaunchScript() throws IOException;
+
}
\ No newline at end of file
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/PreLaunchHelperImpl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/PreLaunchHelperImpl.java 2010-10-11 15:07:21 UTC (rev 5912)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/PreLaunchHelperImpl.java 2010-10-11 15:10:24 UTC (rev 5913)
@@ -24,6 +24,8 @@
import javax.swing.JOptionPane;
+import org.springframework.beans.factory.annotation.Required;
+
import net.sourceforge.squirrel_sql.client.update.UpdateUtil;
import net.sourceforge.squirrel_sql.client.update.gui.ArtifactStatus;
import net.sourceforge.squirrel_sql.client.update.gui.installer.event.InstallStatusListener;
@@ -32,6 +34,7 @@
import net.sourceforge.squirrel_sql.fw.util.FileWrapper;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.fw.util.Utilities;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
@@ -69,24 +72,49 @@
/** Logger for this class. */
private ILogger s_log;
-
+
+ /** Used to override logic for calculating script location for testing purposes */
+ private String scriptLocation = null;
+
/* --------------------------- Spring=injected dependencies --------------------------------------------*/
/* Spring-injected */
private UpdateUtil updateUtil = null;
+ @Required
public void setUpdateUtil(UpdateUtil util)
{
+ Utilities.checkNull("setUpdateUtil", "util", util);
this.updateUtil = util;
}
/* Spring-injected */
private ArtifactInstallerFactory artifactInstallerFactory = null;
+ @Required
public void setArtifactInstallerFactory(ArtifactInstallerFactory artifactInstallerFactory)
{
+ Utilities.checkNull("setArtifactInstallerFactory", "artifactInstallerFactory", artifactInstallerFactory);
this.artifactInstallerFactory = artifactInstallerFactory;
}
+
+ /* Spring-injected */
+ private List<ScriptLineFixer> scriptLineFixers = null;
+
+ @Required
+ public void setScriptLineFixers(List<ScriptLineFixer> scriptLineFixers) {
+ Utilities.checkNull("setScriptLineFixers", "scriptLineFixers", scriptLineFixers);
+ this.scriptLineFixers = scriptLineFixers;
+ }
+
+ /* Spring-injected */
+ FileUtils fileUtils = null;
+
+ @Required
+ public void setFileUtils(FileUtils fileUtils) {
+ Utilities.checkNull("setFileUtils", "fileUtils", fileUtils);
+ this.fileUtils = fileUtils;
+ }
/* ----------------------------------- Public API ------------------------------------------------------*/
@@ -150,6 +178,67 @@
}
/**
+ * Updates the launch script with changes made necessary by the new release.
+ *
+ * @throws IOException if an I/O error occurs
+ */
+ public void updateLaunchScript() throws IOException {
+
+ // 1. determine which script to fix.
+ String os = System.getProperty("os.name");
+
+ String scriptFilename = "squirrel-sql.sh";
+ if (scriptLocation != null) {
+ scriptFilename = scriptLocation;
+ } else {
+ if (os != null && os.toLowerCase().startsWith("windows")) {
+ scriptFilename = "squirrel-sql.bat";
+ }
+ }
+ logInfo("Applying updates to launch script: "+scriptFilename);
+
+ // 2. Get the lines from the file, applying the line fixers
+ List<String> lines = fileUtils.getLinesFromFile(scriptFilename, scriptLineFixers);
+
+ // 3. Write the fixed lines back out to the file.
+ fileUtils.writeLinesToFile(scriptFilename, lines);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.client.update.gui.installer.PreLaunchHelper#restoreFromBackup()
+ */
+ public void restoreFromBackup()
+ {
+ if (showConfirmDialog(RESTORE_FROM_BACKUP_MESSAGE, RESTORE_FROM_BACKUP_TITLE))
+ {
+
+ try
+ {
+ FileWrapper backupDir = updateUtil.getBackupDir();
+ FileWrapper changeListFile = updateUtil.getFile(backupDir, UpdateUtil.CHANGE_LIST_FILENAME);
+ ChangeListXmlBean changeList = updateUtil.getChangeList(changeListFile);
+
+ ArtifactInstaller installer = artifactInstallerFactory.create(changeList, null);
+ if (!installer.restoreBackupFiles())
+ {
+ showErrorDialog(RESTORE_FAILED_MESSAGE);
+ s_log.error("restoreFromBackup: " + RESTORE_FAILED_MESSAGE);
+ }
+
+ }
+ catch (Throwable e)
+ {
+ s_log.error("Unexpected error while attempting restore from backup: " + e.getMessage(), e);
+ showErrorDialog(RESTORE_FAILED_MESSAGE);
+ }
+
+ }
+ shutdown("Pre-launch update app finished");
+ }
+
+ /* ------------------------------------- Helper methods ------------------------------------------------*/
+
+ /**
* Peeks into the changelist file to see if there are artifacts to change. This is precautionary as the GUI
* should prevent the changeList file from being created if there are no artifacts to be changed.
*
@@ -192,42 +281,8 @@
return result;
}
-
+
/**
- * @see net.sourceforge.squirrel_sql.client.update.gui.installer.PreLaunchHelper#restoreFromBackup()
- */
- public void restoreFromBackup()
- {
- if (showConfirmDialog(RESTORE_FROM_BACKUP_MESSAGE, RESTORE_FROM_BACKUP_TITLE))
- {
-
- try
- {
- FileWrapper backupDir = updateUtil.getBackupDir();
- FileWrapper changeListFile = updateUtil.getFile(backupDir, UpdateUtil.CHANGE_LIST_FILENAME);
- ChangeListXmlBean changeList = updateUtil.getChangeList(changeListFile);
-
- ArtifactInstaller installer = artifactInstallerFactory.create(changeList, null);
- if (!installer.restoreBackupFiles())
- {
- showErrorDialog(RESTORE_FAILED_MESSAGE);
- s_log.error("restoreFromBackup: " + RESTORE_FAILED_MESSAGE);
- }
-
- }
- catch (Throwable e)
- {
- s_log.error("Unexpected error while attempting restore from backup: " + e.getMessage(), e);
- showErrorDialog(RESTORE_FAILED_MESSAGE);
- }
-
- }
- shutdown("Pre-launch update app finished");
- }
-
- /* ------------------------------------- Helper methods ------------------------------------------------*/
-
- /**
* Shuts down this small pre-launch helper application.
*/
private void shutdown(String message)
@@ -317,4 +372,20 @@
}
}
+ /**
+ * @param scriptLocation the scriptLocation to set
+ */
+ public void setScriptLocation(String scriptLocation)
+ {
+ this.scriptLocation = scriptLocation;
+ }
+
+ /**
+ * @return the scriptLocation
+ */
+ public String getScriptLocation()
+ {
+ return scriptLocation;
+ }
+
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/PreLaunchUpdateApplication.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/PreLaunchUpdateApplication.java 2010-10-11 15:07:21 UTC (rev 5912)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/PreLaunchUpdateApplication.java 2010-10-11 15:10:24 UTC (rev 5913)
@@ -60,6 +60,7 @@
setupSpringContext();
if (!restore) {
helper.installUpdates(prompt);
+ helper.updateLaunchScript();
} else {
helper.restoreFromBackup();
}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/ScriptLineFixer.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/ScriptLineFixer.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/ScriptLineFixer.java 2010-10-11 15:10:24 UTC (rev 5913)
@@ -0,0 +1,36 @@
+package net.sourceforge.squirrel_sql.client.update.gui.installer;
+
+/*
+ * Copyright (C) 2010 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/**
+ * Interface for line fixer implementations.
+ */
+public interface ScriptLineFixer
+{
+
+ /**
+ * Fixes the line specified, returning the "fixed" version
+ *
+ * @param line
+ * the line that needs to be fixed
+ * @return the fixed line
+ */
+ String fixLine(String line);
+}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/SplashScreenFixer.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/SplashScreenFixer.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/SplashScreenFixer.java 2010-10-11 15:10:24 UTC (rev 5913)
@@ -0,0 +1,69 @@
+package net.sourceforge.squirrel_sql.client.update.gui.installer;
+
+/*
+ * Copyright (C) 2010 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+/**
+ * A line fixer implementation that adds the splash screen icon to the line that launches the SQuirreL
+ * application in the launcher scripts.
+ */
+public class SplashScreenFixer implements ScriptLineFixer {
+
+ /** The main class. Assumption is that this line is where the splash setting needs to be added */
+ public static final String CLIENT_MAIN_CLASS = "net.sourceforge.squirrel_sql.client.Main";
+
+ /** The splash setting */
+ public static final String SPLASH_ICON_ARGUMENT = "-splash:icons/splash.jpg";
+
+ /** A regex pattern version of the main class */
+ private static final String MAIN_CLASS_PATTERN = "net\\.sourceforge\\.squirrel_sql\\.client\\.Main";
+
+ /** The platform-dependent newline string */
+ public static String newline = System.getProperty("line.separator");
+
+ /**
+ * @see net.sourceforge.squirrel_sql.client.update.gui.installer.ScriptLineFixer#fixLine(java.lang.String)
+ */
+ @Override
+ public String fixLine(String line) {
+ String result = line;
+ if (line.contains(CLIENT_MAIN_CLASS)) {
+ if (!line.contains(SPLASH_ICON_ARGUMENT)) {
+ String[] parts = line.split(MAIN_CLASS_PATTERN);
+ if (parts.length == 2) {
+ StringBuilder newline = new StringBuilder();
+ newline.append(parts[0]);
+ newline.append(" ");
+ newline.append(SPLASH_ICON_ARGUMENT);
+ newline.append(" ");
+ newline.append(CLIENT_MAIN_CLASS);
+ newline.append(" ");
+ newline.append(parts[1]);
+ result = newline.toString();
+ } else {
+ System.err.println("Uh-oh, expected parts to be 2");
+ }
+ }
+ }
+ return result;
+ }
+
+
+}
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/update/gui/installer/net.sourceforge.squirrel_sql.client.update.gui.installer.applicationContext.xml
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/update/gui/installer/net.sourceforge.squirrel_sql.client.update.gui.installer.applicationContext.xml 2010-10-11 15:07:21 UTC (rev 5912)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/update/gui/installer/net.sourceforge.squirrel_sql.client.update.gui.installer.applicationContext.xml 2010-10-11 15:10:24 UTC (rev 5913)
@@ -10,11 +10,27 @@
class="net.sourceforge.squirrel_sql.client.update.UpdateUtilImpl">
</bean>
+ <bean id="net.sourceforge.squirrel_sql.client.update.gui.installer.SplashScreenFixer"
+ class="net.sourceforge.squirrel_sql.client.update.gui.installer.SplashScreenFixer">
+ </bean>
+
+ <bean id="net.sourceforge.squirrel_sql.client.update.gui.installer.FileUtils"
+ class="net.sourceforge.squirrel_sql.client.update.gui.installer.FileUtilsImpl">
+ </bean>
+
<bean id="net.sourceforge.squirrel_sql.client.update.gui.installer.PreLaunchHelper"
class="net.sourceforge.squirrel_sql.client.update.gui.installer.PreLaunchHelperImpl">
<property name="updateUtil" ref="net.sourceforge.squirrel_sql.client.update.UpdateUtil"/>
<property name="artifactInstallerFactory"
ref="net.sourceforge.squirrel_sql.client.update.gui.installer.ArtifactInstallerFactory" />
+ <property name="scriptLineFixers">
+ <list>
+ <ref bean="net.sourceforge.squirrel_sql.client.update.gui.installer.SplashScreenFixer"/>
+ </list>
+ </property>
+ <property name="fileUtils"
+ ref="net.sourceforge.squirrel_sql.client.update.gui.installer.FileUtils" />
+
</bean>
<bean id="net.sourceforge.squirrel_sql.client.update.gui.installer.ArtifactInstallerFactory"
Added: trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/update/gui/installer/PreLaunchHelperImplIntegrationTest.java
===================================================================
--- trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/update/gui/installer/PreLaunchHelperImplIntegrationTest.java (rev 0)
+++ trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/update/gui/installer/PreLaunchHelperImplIntegrationTest.java 2010-10-11 15:10:24 UTC (rev 5913)
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2007 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.client.update.gui.installer;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.List;
+
+import net.sourceforge.squirrel_sql.client.ApplicationArguments;
+import net.sourceforge.squirrel_sql.fw.util.FileWrapper;
+import net.sourceforge.squirrel_sql.fw.util.FileWrapperFactory;
+import net.sourceforge.squirrel_sql.fw.util.FileWrapperFactoryImpl;
+import net.sourceforge.squirrel_sql.fw.util.IOUtilities;
+import net.sourceforge.squirrel_sql.fw.util.IOUtilitiesImpl;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestExecutionListeners;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@TestExecutionListeners( {})
+@ContextConfiguration(locations = {
+ "/net/sourceforge/squirrel_sql/client/update/gui/installer/net.sourceforge.squirrel_sql.client.update.gui.installer.applicationContext.xml",
+ "/net/sourceforge/squirrel_sql/client/update/gui/installer/event/net.sourceforge.squirrel_sql.client.update.gui.installer.event.applicationContext.xml",
+ "/net/sourceforge/squirrel_sql/client/update/gui/installer/util/net.sourceforge.squirrel_sql.client.update.gui.installer.util.applicationContext.xml",
+ "/net/sourceforge/squirrel_sql/client/update/util/net.sourceforge.squirrel_sql.client.update.util.applicationContext.xml" })
+public class PreLaunchHelperImplIntegrationTest extends AbstractJUnit4SpringContextTests
+{
+
+ static
+ {
+ ApplicationArguments.initialize(new String[] { "-home", "./target" });
+ }
+
+ @Autowired
+ private FileUtils fileUtils;
+
+ public static final String beanIdToTest =
+ "net.sourceforge.squirrel_sql.client.update.gui.installer.PreLaunchHelper";
+
+ private static final String SOURCE_SCRIPT_FILE_TO_TEST = "src/test/resources/squirrel-sql.sh";
+
+ private static final String TARGET_SCRIPT_FILE_TO_TEST = "target/squirrel-sql-copy.sh";
+
+ /** TODO: Spring-inject when this class is a Spring bean */
+ private IOUtilities _iou = new IOUtilitiesImpl();
+
+ public void setIOUtilities(IOUtilities iou)
+ {
+ _iou = iou;
+ }
+
+ /** TODO: Spring-inject when this class is a Spring bean */
+ private FileWrapperFactory _fileWrapperFactory = new FileWrapperFactoryImpl();
+
+ public void setFileWrapperFactory(FileWrapperFactory factory)
+ {
+ _fileWrapperFactory = factory;
+ }
+
+
+ /**
+ * This test confirms that the launch script can be updated to include the new Splash screen icon
+ * configuration.
+ *
+ * @throws IOException
+ */
+ @Test
+ public void testUpdateLaunchScript() throws IOException
+ {
+
+ FileWrapper sourceScriptFile = _fileWrapperFactory.create(SOURCE_SCRIPT_FILE_TO_TEST);
+ FileWrapper targetScriptFile = _fileWrapperFactory.create(TARGET_SCRIPT_FILE_TO_TEST);
+ _iou.copyFile(sourceScriptFile, targetScriptFile);
+
+ // Confirm that the script doesn't contain the splash screen icon setting.
+ checkScriptFile(false);
+
+ PreLaunchHelperImpl beanToTest = (PreLaunchHelperImpl) applicationContext.getBean(beanIdToTest);
+ beanToTest.setScriptLocation(TARGET_SCRIPT_FILE_TO_TEST);
+ beanToTest.updateLaunchScript();
+
+ // Confirm that the script now contain the splash screen icon setting.
+ checkScriptFile(true);
+ }
+
+ private void checkScriptFile(boolean containsSplashIconArgument) throws IOException
+ {
+ List<String> linesFromScriptFile = fileUtils.getLinesFromFile(TARGET_SCRIPT_FILE_TO_TEST, null);
+ boolean foundMainClassLine = false;
+ for (String line : linesFromScriptFile)
+ {
+ if (line.contains(SplashScreenFixer.CLIENT_MAIN_CLASS))
+ {
+ foundMainClassLine = true;
+ if (!containsSplashIconArgument) {
+ assertFalse(line.contains(SplashScreenFixer.SPLASH_ICON_ARGUMENT));
+ } else {
+ assertTrue(line.contains(SplashScreenFixer.SPLASH_ICON_ARGUMENT));
+ }
+ }
+ }
+ Assert.assertTrue(foundMainClassLine);
+ }
+}
Added: trunk/sql12/app/src/test/resources/squirrel-sql.sh
===================================================================
--- trunk/sql12/app/src/test/resources/squirrel-sql.sh (rev 0)
+++ trunk/sql12/app/src/test/resources/squirrel-sql.sh 2010-10-11 15:10:24 UTC (rev 5913)
@@ -0,0 +1,123 @@
+#! /bin/sh
+
+# This function sets a global variable named "CP" to a command-path separated list of jars located beneath the
+# specified folder. If the specified folder contains a lib directory, then jars beneath the lib folder are
+# @ added as well as the squirrel-sql.jar file located in the directory specified as the first argument to
+# this function.
+buildCPFromDir()
+{
+ if [ -d "$1"/lib ]; then
+ # First entry in classpath is the Squirrel application.
+ CP="$1/squirrel-sql.jar"
+
+ # Then add all library jars to the classpath.
+ for a in "$1"/lib/*; do
+ CP="$CP":"$a"
+ done
+ else
+ for a in "$1"/*; do
+ CP="$CP":"$a"
+ done
+ fi
+}
+
+# IZPACK_JAVA_HOME is filtered in by the IzPack installer when this script is installed
+IZPACK_JAVA_HOME=/opt/jdk1.6.0_14_x64/jre
+
+# We detect the java executable to use according to the following algorithm:
+#
+# 1. If it is located in JAVA_HOME, then we use that; or
+# 2. If the one used by the IzPack installer is available then use that, otherwise
+# 3. Use the java that is in the command path.
+#
+if [ -d "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
+ JAVACMD="$JAVA_HOME/bin/java"
+elif [ -d "$IZPACK_JAVA_HOME" -a -x "$IZPACK_JAVA_HOME/bin/java" ]; then
+ JAVACMD="$IZPACK_JAVA_HOME/bin/java"
+else
+ JAVACMD=java
+fi
+
+# Are we running within Cygwin on some version of Windows or on Mac OS X?
+cygwin=false;
+macosx=false;
+case "`uname -s`" in
+ CYGWIN*)
+ cygwin=true
+ ;;
+ Darwin*)
+ macosx=true
+ ;;
+esac
+
+# SQuirreL home.
+if $macosx ; then
+ SQUIRREL_SQL_HOME='/tmp/squirrel-sql-Snapshot-20100918_1720/Contents/Resources/Java'
+else
+ SQUIRREL_SQL_HOME='/tmp/squirrel-sql-Snapshot-20100918_1720'
+fi
+
+# SQuirreL home in Unix format.
+if $cygwin ; then
+ UNIX_STYLE_HOME=`cygpath "$SQUIRREL_SQL_HOME"`
+else
+ UNIX_STYLE_HOME="$SQUIRREL_SQL_HOME"
+fi
+
+cd "$UNIX_STYLE_HOME"
+
+# Check to see if the JVM meets the minimum required to run SQuirreL and inform the user if not and skip
+# launch. versioncheck.jar is a special jar file which has been compiled with javac version 1.2.2, which
+# should be able to be run by that version or higher. The arguments to JavaVersionChecker below specify the
+# minimum acceptable version (first arg) and any other acceptable subsequent versions. <MAJOR>.<MINOR> should
+# be all that is necessary for the version form.
+$JAVACMD -cp "$UNIX_STYLE_HOME/lib/versioncheck.jar" JavaVersionChecker 1.6 1.7
+if [ "$?" = "1" ]; then
+ exit
+fi
+
+# Build a command-path separated list of installed jars from the lib folder and squirrel-sql.jar
+buildCPFromDir "$UNIX_STYLE_HOME"
+TMP_CP=$CP
+
+# Set the update app's classpath to use jars in download area first, then the installed jars
+buildCPFromDir "$UNIX_STYLE_HOME/update/downloads/core"
+UPDATE_CP=$CP:$TMP_CP
+
+# Now add the system classpath to the classpath. If running
+# Cygwin we also need to change the classpath to Windows format.
+if $cygwin ; then
+ TMP_CP=`cygpath -w -p $TMP_CP`
+ UPDATE_CP=`cygpath -w -p $UPDATE_CP`
+ TMP_CP=$TMP_CP';'$CLASSPATH
+ UPDATE_CP=$UPDATE_CP';'$CLASSPATH
+else
+ TMP_CP=$TMP_CP:$CLASSPATH
+ UPDATE_CP=$UPDATE_CP:$CLASSPATH
+fi
+
+if $macosx ; then
+ # Define mac-specific system properties if running on Mac OS X
+ MACOSX_UPDATER_PROPS="-Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=SQuirreLSQLUpdater"
+ MACOSX_SQUIRREL_PROPS="-Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=SQuirreLSQL"
+ NATIVE_LAF_PROP="--native-laf"
+fi
+
+# Check for updates and prompt to apply if any are available
+if [ -f "$UNIX_STYLE_HOME/update/downloads/core/squirrel-sql.jar" -a -f "$UNIX_STYLE_HOME/update/changeList.xml" ]; then
+ $JAVACMD -cp "$UPDATE_CP" $MACOSX_UPDATER_PROPS -Dlog4j.defaultInitOverride=true -Dprompt=true net.sourceforge.squirrel_sql.client.update.gui.installer.PreLaunchUpdateApplication -l "$UNIX_STYLE_HOME/update-log4j.properties"
+fi
+
+if $macosx ; then
+ # macosx provides unknown args to the script, causing SQuirreL to bail..
+ SCRIPT_ARGS=""
+else
+ SCRIPT_ARGS="$1 $2 $3 $4 $5 $6 $7 $8 $9"
+fi
+
+# Now, pickup all jars once again from the installation and lib directories in case any new jars were
+# downloaded during the update process. The variable "CP" is assigned this value.
+buildCPFromDir "$UNIX_STYLE_HOME"
+
+# Launch SQuirreL application
+$JAVACMD -Xmx256m -cp "$CP" $MACOSX_SQUIRREL_PROPS net.sourceforge.squirrel_sql.client.Main --log-config-file "$UNIX_STYLE_HOME"/log4j.properties --squirrel-home "$UNIX_STYLE_HOME" $NATIVE_LAF_PROP $SCRIPT_ARGS
Property changes on: trunk/sql12/app/src/test/resources/squirrel-sql.sh
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wi...@us...> - 2011-09-24 18:40:56
|
Revision: 6410
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6410&view=rev
Author: wis775
Date: 2011-09-24 18:40:50 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------
3408086: Non ASCII characters are highlighted as as invalid characters at the SQL-Editor pane. Removed the limitation to ASCII - Added some test cases and fixed a IndexOutOfBoundException.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/Scanner.java
Added Paths:
-----------
trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/ScannerTest.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/Scanner.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/Scanner.java 2011-09-24 10:06:57 UTC (rev 6409)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/Scanner.java 2011-09-24 18:40:50 UTC (rev 6410)
@@ -73,7 +73,13 @@
private static final char CR = '\r';
private static final char LF = '\n';
private static final int noSym = 103;
- private static final int[] start = {
+
+ /**
+ * The constants in this array are very confusing.
+ * I don't think, that the constants don't mean, what their name said. e.g. for the '*' character, the constant ParsingConstants.KW_UNION is used.
+ * Seems, that this is the result of a refactoring task.
+ */
+ private static final int[] start = {
ParsingConstants.KW_AS, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 1, 4, 1, 1, 0, 0, ParsingConstants.KIND_OPENING_BRAKET, ParsingConstants.KW_UNION, 22, ParsingConstants.KW_ALL, ParsingConstants.KW_INSERT, ParsingConstants.KW_DISTINCT, ParsingConstants.KW_UPDATE, 2, ParsingConstants.KIND_EQUALS,
@@ -334,8 +340,14 @@
t = new Token();
t.pos = pos; t.col = pos - lineStart + 1; t.line = line;
StringBuffer buf = new StringBuffer();
- int state = start[ch];
- int apx = 0;
+ int state;
+ if(ch < start.length){
+ // the start state is only defined for the first 128 characters.
+ state = start[ch];
+ }else{
+ // for the rest, assume the value 1;
+ state = 1;
+ }
loop: for (;;) {
buf.append(strCh);
NextCh();
Added: trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/ScannerTest.java
===================================================================
--- trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/ScannerTest.java (rev 0)
+++ trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/ScannerTest.java 2011-09-24 18:40:50 UTC (rev 6410)
@@ -0,0 +1,193 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.client.session.parser.kernel;
+
+import static org.mockito.Mockito.*;
+import static org.junit.Assert.*;
+
+import net.sourceforge.squirrel_sql.client.session.parser.kernel.Scanner.Buffer;
+import net.sourceforge.squirrel_sql.client.session.parser.kernel.Scanner.SBuffer;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+/**
+ * This test class is used, to make clear, how the scanner works :-)
+ * @author Stefan Willinger
+ *
+ */
+public class ScannerTest {
+ private Scanner classUnderTest;
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @Before
+ public void setUp() throws Exception {
+
+ }
+
+ /**
+ * Ensure, that a comment can contain non ASCII characters.
+ * The previous behavior was to add an "invalid character in source file" error for each character greater than the ASCII range ('\u007f').
+ */
+ @Test
+ public void testCommentWithNonASCII() {
+ SBuffer mockBuffer = new SBuffer("/*Ä*/ select");
+
+ ErrorStream mockErrorStream = Mockito.mock(ErrorStream.class);
+ classUnderTest = new Scanner(mockBuffer, mockErrorStream);
+ Token token = classUnderTest.Scan();
+
+ assertEquals("select", token.str);
+
+ verifyZeroInteractions(mockErrorStream);
+ }
+
+
+ /**
+ * Ensure, that a statement can contain a non ASCII character
+ */
+ @Test
+ public void testStatementWithNonASCII() {
+ SBuffer mockBuffer = new SBuffer("select sysdate as Ä from dual");
+
+ ErrorStream mockErrorStream = Mockito.mock(ErrorStream.class);
+ classUnderTest = new Scanner(mockBuffer, mockErrorStream);
+ Token token;
+
+ token = classUnderTest.Scan();
+ assertEquals("select", token.str);
+ assertEquals(ParsingConstants.KW_SELECT, token.kind);
+
+ token = classUnderTest.Scan();
+ assertEquals("sysdate", token.str);
+ assertEquals(1, token.kind);
+
+ token = classUnderTest.Scan();
+ assertEquals("as", token.str);
+ assertEquals(ParsingConstants.KW_AS, token.kind);
+
+ token = classUnderTest.Scan();
+ assertEquals("Ä", token.str);
+ assertEquals(1, token.kind);
+
+ token = classUnderTest.Scan();
+ assertEquals("from", token.str);
+ assertEquals(ParsingConstants.KW_FROM, token.kind);
+
+ token = classUnderTest.Scan();
+ assertEquals("dual", token.str);
+ assertEquals(1, token.kind);
+
+ verifyZeroInteractions(mockErrorStream);
+ }
+
+
+ @Test
+ public void testTokenKind_Select() {
+ SBuffer mockBuffer = new SBuffer("select");
+
+ ErrorStream mockErrorStream = Mockito.mock(ErrorStream.class);
+ classUnderTest = new Scanner(mockBuffer, mockErrorStream);
+ Token token = classUnderTest.Scan();
+
+ assertEquals("select", token.str);
+ assertEquals(ParsingConstants.KW_SELECT, token.kind);
+
+ verifyZeroInteractions(mockErrorStream);
+ }
+
+ /**
+ * Just for playing with the Scanner to understand it.
+ */
+ @Test
+ public void testTokenKind_WithNumbers() {
+ SBuffer mockBuffer = new SBuffer("select8");
+
+ ErrorStream mockErrorStream = Mockito.mock(ErrorStream.class);
+ classUnderTest = new Scanner(mockBuffer, mockErrorStream);
+ Token token = classUnderTest.Scan();
+
+ assertEquals("select8", token.str);
+ // Maybe, 1 means "No Keyword"
+ assertEquals(1, token.kind);
+
+ verifyZeroInteractions(mockErrorStream);
+ }
+
+ /**
+ * Ensure, that the open bracket is read correctly.
+ */
+ @Test
+ public void testOpenBracket() {
+ SBuffer mockBuffer = new SBuffer("(");
+
+ ErrorStream mockErrorStream = Mockito.mock(ErrorStream.class);
+ classUnderTest = new Scanner(mockBuffer, mockErrorStream);
+ Token token = classUnderTest.Scan();
+
+ assertEquals("(", token.str);
+ assertEquals(ParsingConstants.KIND_OPENING_BRAKET, token.kind);
+
+ verifyZeroInteractions(mockErrorStream);
+ }
+
+ @Test
+ public void testSemikolon() {
+ SBuffer mockBuffer = new SBuffer(";");
+
+ ErrorStream mockErrorStream = Mockito.mock(ErrorStream.class);
+ classUnderTest = new Scanner(mockBuffer, mockErrorStream);
+ Token token = classUnderTest.Scan();
+
+ assertEquals(";", token.str);
+ assertEquals(6, token.kind);
+
+ verifyZeroInteractions(mockErrorStream);
+ }
+
+
+
+ /**
+ * For printing out the characters corresponding to the start array of the scanner.
+ * Just for understanding this array.
+ */
+ public static void main(String[] args) {
+ // This is a copy of the field at the scanner.
+ int[] start = {
+ ParsingConstants.KW_AS, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1, 4, 1, 1, 0, 0, ParsingConstants.KIND_OPENING_BRAKET, ParsingConstants.KW_UNION, 22, ParsingConstants.KW_ALL, ParsingConstants.KW_INSERT, ParsingConstants.KW_DISTINCT, ParsingConstants.KW_UPDATE, 2, ParsingConstants.KIND_EQUALS,
+ ParsingConstants.KW_EXCEPT, ParsingConstants.KW_EXCEPT, ParsingConstants.KW_EXCEPT, ParsingConstants.KW_EXCEPT, ParsingConstants.KW_EXCEPT, ParsingConstants.KW_EXCEPT, ParsingConstants.KW_EXCEPT, ParsingConstants.KW_EXCEPT, ParsingConstants.KW_EXCEPT, ParsingConstants.KW_EXCEPT, ParsingConstants.KW_SET, ParsingConstants.KW_INTERSECT, ParsingConstants.KW_INTO, ParsingConstants.KW_MINUS, ParsingConstants.KW_FROM, 0,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1,
+ 0};
+
+ for (int i = 0; i < start.length; i++) {
+ System.out.println(((char) i) + "=" + start[i]);
+
+ }
+ }
+
+
+}
Property changes on: trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/ScannerTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-11-05 13:09:37
|
Revision: 6471
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6471&view=rev
Author: manningr
Date: 2011-11-05 13:09:30 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
When updates are performed, if we are pointing to www.squirrel-sql.net, then we switch the settings to point to the new update site at sourceforge.net.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/IUpdateSettings.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferences.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/UpdateSettings.java
trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/preferences/UpdateSettingsTest.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/IUpdateSettings.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/IUpdateSettings.java 2011-11-05 12:05:40 UTC (rev 6470)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/IUpdateSettings.java 2011-11-05 13:09:30 UTC (rev 6471)
@@ -25,6 +25,10 @@
public interface IUpdateSettings
{
+ public static final String DEFAULT_UPDATE_SERVER = "sourceforge.net";
+ public static final String DEFAULT_UPDATE_PORT = "80";
+ public static final String DEFAULT_UPDATE_PATH = "projects/squirrel-sql/files/updates";
+
/**
* @return the updateServer
*/
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferences.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferences.java 2011-11-05 12:05:40 UTC (rev 6470)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferences.java 2011-11-05 13:09:30 UTC (rev 6471)
@@ -857,14 +857,14 @@
setJdbcDebugType(IJdbcDebugTypes.NONE);
}
- @SuppressWarnings("unchecked")
- public static SquirrelPreferences load()
+ public static SquirrelPreferences load()
{
File prefsFile = new ApplicationFiles().getUserPreferencesFile();
try
{
XMLBeanReader doc = new XMLBeanReader();
doc.load(prefsFile);
+ @SuppressWarnings("rawtypes")
Iterator it = doc.iterator();
if (it.hasNext())
{
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/UpdateSettings.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/UpdateSettings.java 2011-11-05 12:05:40 UTC (rev 6470)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/UpdateSettings.java 2011-11-05 13:09:30 UTC (rev 6471)
@@ -30,13 +30,13 @@
private static final long serialVersionUID = -1305655179503568153L;
/** Name of software update server. */
- private String updateServer = "sourceforge.net";
+ private String updateServer = IUpdateSettings.DEFAULT_UPDATE_SERVER;
/** Port for software update server. */
- private String updateServerPort = "80";
+ private String updateServerPort = IUpdateSettings.DEFAULT_UPDATE_PORT;
/** Path to channel directories on software update server. */
- private String updateServerPath = "projects/squirrel-sql/files/updates";
+ private String updateServerPath = IUpdateSettings.DEFAULT_UPDATE_PATH;
/** Update channel on the software update server. */
private String updateServerChannel = "stable";
@@ -49,18 +49,20 @@
/** The last time an update check was made in milliseconds */
private String lastUpdateCheckTimeMillis = "0";
-
+
/** Whether or not the update site is on a remote server */
private boolean isRemoteUpdateSite = true;
-
+
private String fileSystemUpdatePath = "";
-
- public UpdateSettings() {
- if (Version.isSnapshotVersion()) {
+
+ public UpdateSettings()
+ {
+ if (Version.isSnapshotVersion())
+ {
updateServerChannel = "snapshot";
}
}
-
+
/**
* @see java.lang.Object#clone()
*/
@@ -71,156 +73,190 @@
}
/**
- * Copy Constructor
- *
- * @param updateSettings a <code>UpdateSettings</code> object
- */
- public UpdateSettings(IUpdateSettings updateSettings)
- {
- this.updateServer = updateSettings.getUpdateServer();
- this.updateServerPort = updateSettings.getUpdateServerPort();
- this.updateServerPath = updateSettings.getUpdateServerPath();
- this.updateServerChannel = updateSettings.getUpdateServerChannel();
- this.enableAutomaticUpdates = updateSettings.isEnableAutomaticUpdates();
- this.updateCheckFrequency = updateSettings.getUpdateCheckFrequency();
- this.lastUpdateCheckTimeMillis = updateSettings.getLastUpdateCheckTimeMillis();
- this.isRemoteUpdateSite = updateSettings.isRemoteUpdateSite();
- this.fileSystemUpdatePath = updateSettings.getFileSystemUpdatePath();
- }
+ * Copy Constructor
+ *
+ * @param updateSettings
+ * a <code>UpdateSettings</code> object
+ */
+ public UpdateSettings(IUpdateSettings updateSettings)
+ {
+ String server = updateSettings.getUpdateServer();
+ String port = updateSettings.getUpdateServerPort();
+ String path = updateSettings.getUpdateServerPath();
+ if (server != null && server.equalsIgnoreCase("www.squirrel-sql.net")) {
+ server = "sourceforge.net";
+ port = "80";
+ path = "projects/squirrel-sql/files/updates";
+ }
+
+
+ this.updateServer = server;
+ this.updateServerPort = port;
+ this.updateServerPath = path;
+ this.updateServerChannel = updateSettings.getUpdateServerChannel();
+ this.enableAutomaticUpdates = updateSettings.isEnableAutomaticUpdates();
+ this.updateCheckFrequency = updateSettings.getUpdateCheckFrequency();
+ this.lastUpdateCheckTimeMillis = updateSettings.getLastUpdateCheckTimeMillis();
+ this.isRemoteUpdateSite = updateSettings.isRemoteUpdateSite();
+ this.fileSystemUpdatePath = updateSettings.getFileSystemUpdatePath();
+ }
- /**
- * @return the updateServer
- */
- public String getUpdateServer() {
- return updateServer;
- }
+ /**
+ * @return the updateServer
+ */
+ public String getUpdateServer()
+ {
+ return updateServer;
+ }
- /**
- * @param updateServer the updateServer to set
- */
- public void setUpdateServer(String updateServer) {
- this.updateServer = updateServer;
- }
+ /**
+ * @param updateServer
+ * the updateServer to set
+ */
+ public void setUpdateServer(String updateServer)
+ {
+ this.updateServer = updateServer;
+ }
- /**
- * @return the updateServerPort
- */
- public String getUpdateServerPort() {
- return updateServerPort;
- }
+ /**
+ * @return the updateServerPort
+ */
+ public String getUpdateServerPort()
+ {
+ return updateServerPort;
+ }
- /**
- * @param updateServerPort the updateServerPort to set
- */
- public void setUpdateServerPort(String updateServerPort) {
- this.updateServerPort = updateServerPort;
- }
+ /**
+ * @param updateServerPort
+ * the updateServerPort to set
+ */
+ public void setUpdateServerPort(String updateServerPort)
+ {
+ this.updateServerPort = updateServerPort;
+ }
- /**
- * @return the updateServerPath
- */
- public String getUpdateServerPath() {
- return updateServerPath;
- }
+ /**
+ * @return the updateServerPath
+ */
+ public String getUpdateServerPath()
+ {
+ return updateServerPath;
+ }
- /**
- * @param updateServerPath the updateServerPath to set
- */
- public void setUpdateServerPath(String updateServerPath) {
- this.updateServerPath = updateServerPath;
- }
+ /**
+ * @param updateServerPath
+ * the updateServerPath to set
+ */
+ public void setUpdateServerPath(String updateServerPath)
+ {
+ this.updateServerPath = updateServerPath;
+ }
- /**
- * @return the updateServerChannel
- */
- public String getUpdateServerChannel() {
- return updateServerChannel;
- }
+ /**
+ * @return the updateServerChannel
+ */
+ public String getUpdateServerChannel()
+ {
+ return updateServerChannel;
+ }
- /**
- * @param updateServerChannel the updateServerChannel to set
- */
- public void setUpdateServerChannel(String updateServerChannel) {
- this.updateServerChannel = updateServerChannel;
- }
+ /**
+ * @param updateServerChannel
+ * the updateServerChannel to set
+ */
+ public void setUpdateServerChannel(String updateServerChannel)
+ {
+ this.updateServerChannel = updateServerChannel;
+ }
- /**
- * @return the enableAutomaticUpdates
- */
- public boolean isEnableAutomaticUpdates() {
- return enableAutomaticUpdates;
- }
+ /**
+ * @return the enableAutomaticUpdates
+ */
+ public boolean isEnableAutomaticUpdates()
+ {
+ return enableAutomaticUpdates;
+ }
- /**
- * @param enableAutomaticUpdates the enableAutomaticUpdates to set
- */
- public void setEnableAutomaticUpdates(boolean enableAutomaticUpdates) {
- this.enableAutomaticUpdates = enableAutomaticUpdates;
- }
+ /**
+ * @param enableAutomaticUpdates
+ * the enableAutomaticUpdates to set
+ */
+ public void setEnableAutomaticUpdates(boolean enableAutomaticUpdates)
+ {
+ this.enableAutomaticUpdates = enableAutomaticUpdates;
+ }
- /**
- * @return the updateCheckFrequency
- */
- public String getUpdateCheckFrequency() {
- return updateCheckFrequency;
- }
-
- /**
- * @param updateCheckFrequency the updateCheckFrequency to set
- */
- public void setUpdateCheckFrequency(String updateCheckFrequency) {
- this.updateCheckFrequency = updateCheckFrequency;
- }
+ /**
+ * @return the updateCheckFrequency
+ */
+ public String getUpdateCheckFrequency()
+ {
+ return updateCheckFrequency;
+ }
- /**
- * @return the lastUpdateCheckTimeMillis
- */
- public String getLastUpdateCheckTimeMillis() {
- return lastUpdateCheckTimeMillis;
- }
+ /**
+ * @param updateCheckFrequency
+ * the updateCheckFrequency to set
+ */
+ public void setUpdateCheckFrequency(String updateCheckFrequency)
+ {
+ this.updateCheckFrequency = updateCheckFrequency;
+ }
- /**
- * @param lastUpdateCheckTimeMillis the lastUpdateCheckTimeMillis to set
- */
- public void setLastUpdateCheckTimeMillis(String lastUpdateCheckTimeMillis) {
- this.lastUpdateCheckTimeMillis = lastUpdateCheckTimeMillis;
- }
+ /**
+ * @return the lastUpdateCheckTimeMillis
+ */
+ public String getLastUpdateCheckTimeMillis()
+ {
+ return lastUpdateCheckTimeMillis;
+ }
- /**
- * Returns a boolean value to indicate whether or not the user wants to use
- * a remote site. If this is false, it is assumed to mean that the user
- * wants to specify a local directory on the filesystem
- *
- * @return true if remote site; false otherwise.
- */
- public boolean isRemoteUpdateSite() {
- return this.isRemoteUpdateSite;
- }
+ /**
+ * @param lastUpdateCheckTimeMillis
+ * the lastUpdateCheckTimeMillis to set
+ */
+ public void setLastUpdateCheckTimeMillis(String lastUpdateCheckTimeMillis)
+ {
+ this.lastUpdateCheckTimeMillis = lastUpdateCheckTimeMillis;
+ }
- /**
- * Sets a boolean value to indicate whether or not the user wants to use
- * a remote site. If this is false, it is assumed to mean that the user
- * wants to specify a local directory on the filesystem
- *
- * @param true for remote site; false for local directory.
- */
- public void setRemoteUpdateSite(boolean isRemoteUpdateSite) {
- this.isRemoteUpdateSite = isRemoteUpdateSite;
- }
+ /**
+ * Returns a boolean value to indicate whether or not the user wants to use a remote site. If this is
+ * false, it is assumed to mean that the user wants to specify a local directory on the filesystem
+ *
+ * @return true if remote site; false otherwise.
+ */
+ public boolean isRemoteUpdateSite()
+ {
+ return this.isRemoteUpdateSite;
+ }
- /**
- * @return the fileSystemUpdatePath
- */
- public String getFileSystemUpdatePath() {
- return fileSystemUpdatePath;
- }
+ /**
+ * Sets a boolean value to indicate whether or not the user wants to use a remote site. If this is false,
+ * it is assumed to mean that the user wants to specify a local directory on the filesystem
+ *
+ * @param true for remote site; false for local directory.
+ */
+ public void setRemoteUpdateSite(boolean isRemoteUpdateSite)
+ {
+ this.isRemoteUpdateSite = isRemoteUpdateSite;
+ }
- /**
- * @param fileSystemUpdatePath the fileSystemUpdatePath to set
- */
- public void setFileSystemUpdatePath(String fileSystemUpdatePath) {
- this.fileSystemUpdatePath = fileSystemUpdatePath;
- }
-
-
+ /**
+ * @return the fileSystemUpdatePath
+ */
+ public String getFileSystemUpdatePath()
+ {
+ return fileSystemUpdatePath;
+ }
+
+ /**
+ * @param fileSystemUpdatePath
+ * the fileSystemUpdatePath to set
+ */
+ public void setFileSystemUpdatePath(String fileSystemUpdatePath)
+ {
+ this.fileSystemUpdatePath = fileSystemUpdatePath;
+ }
+
}
\ No newline at end of file
Modified: trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/preferences/UpdateSettingsTest.java
===================================================================
--- trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/preferences/UpdateSettingsTest.java 2011-11-05 12:05:40 UTC (rev 6470)
+++ trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/preferences/UpdateSettingsTest.java 2011-11-05 13:09:30 UTC (rev 6471)
@@ -185,4 +185,15 @@
assertFalse(clone.isEnableAutomaticUpdates());
}
+ @Test
+ public void testCopyConstuctorMigrateOldHostSettings() {
+ expect(mockUpdateSettings.getUpdateServer()).andReturn("www.squirrel-sql.net");
+ mockHelper.replayAll();
+ UpdateSettings copiedSettings = new UpdateSettings(mockUpdateSettings);
+ mockHelper.verifyAll();
+
+ assertEquals(IUpdateSettings.DEFAULT_UPDATE_SERVER, copiedSettings.getUpdateServer());
+ assertEquals(IUpdateSettings.DEFAULT_UPDATE_PORT, copiedSettings.getUpdateServerPort());
+ assertEquals(IUpdateSettings.DEFAULT_UPDATE_PATH, copiedSettings.getUpdateServerPath());
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
