Author: tg
Date: 2016-11-22 13:07:23 +0000 (Tue, 22 Nov 2016)
New Revision: 19179
Modified:
trunk/squirrel-sql/debian/patches/001-squirrelsql-jgoodies.patch
trunk/squirrel-sql/debian/patches/006-launch-script-debian.patch
trunk/squirrel-sql/debian/patches/008-native2ascii.patch
trunk/squirrel-sql/debian/patches/009-plugin-liclink.patch
trunk/squirrel-sql/debian/patches/disable_autoupdate.dpatch
Log:
quilt refresh all patches
Modified: trunk/squirrel-sql/debian/patches/001-squirrelsql-jgoodies.patch
===================================================================
--- trunk/squirrel-sql/debian/patches/001-squirrelsql-jgoodies.patch
2016-11-18 09:28:32 UTC (rev 19178)
+++ trunk/squirrel-sql/debian/patches/001-squirrelsql-jgoodies.patch
2016-11-22 13:07:23 UTC (rev 19179)
@@ -145,7 +145,7 @@
* <pre>
* public void build() {
* FormLayout layout = new FormLayout(
-@@ -68,7 +109,7 @@
+@@ -68,7 +109,7 @@ import com.jgoodies.forms.layout.RowSpec
* builder.append("Identifier", identifierField);
* builder.nextLine();
*
@@ -154,7 +154,7 @@
* builder.append("Power [kW]", new JTextField());
*
* builder.append("s [mm]", new JTextField());
-@@ -76,18 +117,18 @@
+@@ -76,18 +117,18 @@ import com.jgoodies.forms.layout.RowSpec
*
* builder.appendSeparator("Diameters");
*
@@ -177,7 +177,7 @@
* builder.append("k-factor", new JTextField());
*
* builder.appendSeparator("Bolts");
-@@ -100,199 +141,354 @@
+@@ -100,199 +141,354 @@ import com.jgoodies.forms.layout.RowSpec
*
* builder.append("ds [mm]", new JTextField());
* }
@@ -603,7 +603,7 @@
* @param textWithMnemonic the label's text - may mark a mnemonic
* @return the added label
*/
-@@ -301,212 +497,296 @@
+@@ -301,212 +497,296 @@ public final class DefaultFormBuilder ex
append(label);
return label;
}
@@ -985,7 +985,7 @@
* @param textWithMnemonic the label's text - may mark a mnemonic
* @return the added title label
*/
-@@ -515,35 +795,43 @@
+@@ -515,35 +795,43 @@ public final class DefaultFormBuilder ex
append(titleLabel);
return titleLabel;
}
@@ -1035,7 +1035,7 @@
setColumn(super.getLeadingColumn());
int columnSpan = getColumnCount();
setColumnSpan(getColumnCount());
-@@ -552,47 +840,60 @@
+@@ -552,47 +840,60 @@ public final class DefaultFormBuilder ex
nextColumn(columnSpan);
return titledSeparator;
}
@@ -1106,7 +1106,7 @@
if (getRow() <= getRowCount()) {
RowSpec rowSpec = getCursorRowSpec();
if ((rowSpec == gapRowSpec))
-@@ -601,25 +902,29 @@
+@@ -601,25 +902,29 @@ public final class DefaultFormBuilder ex
appendRow(gapRowSpec);
nextLine();
}
Modified: trunk/squirrel-sql/debian/patches/006-launch-script-debian.patch
===================================================================
--- trunk/squirrel-sql/debian/patches/006-launch-script-debian.patch
2016-11-18 09:28:32 UTC (rev 19178)
+++ trunk/squirrel-sql/debian/patches/006-launch-script-debian.patch
2016-11-22 13:07:23 UTC (rev 19179)
@@ -6,7 +6,7 @@
Last-Update: 2011-03-01
--- a/installer/squirrelsql-launcher/src/main/resources/squirrel-sql.sh
+++ b/installer/squirrelsql-launcher/src/main/resources/squirrel-sql.sh
-@@ -23,7 +23,7 @@
+@@ -23,7 +23,7 @@ buildCPFromDir()
}
# IZPACK_JAVA_HOME is filtered in by the IzPack installer when this script is
installed
@@ -15,7 +15,7 @@
# We detect the java executable to use according to the following algorithm:
#
-@@ -53,9 +53,9 @@
+@@ -53,9 +53,9 @@ esac
# SQuirreL home.
if $macosx ; then
Modified: trunk/squirrel-sql/debian/patches/008-native2ascii.patch
===================================================================
--- trunk/squirrel-sql/debian/patches/008-native2ascii.patch 2016-11-18
09:28:32 UTC (rev 19178)
+++ trunk/squirrel-sql/debian/patches/008-native2ascii.patch 2016-11-22
13:07:23 UTC (rev 19179)
@@ -2,9 +2,28 @@
Forwarded: not-needed
From: Vladimir Kotov <vladi...@kotov.lv>
Last-Update: 2011-03-01
+---
a/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/PleaseWaitDialog.java
++++
b/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/PleaseWaitDialog.java
+@@ -1,6 +1,6 @@
+ package net.sourceforge.squirrel_sql.client.session.mainpanel;
+ /*
+- * Copyright (C) 2007 Thorsten Mürell
++ * Copyright (C) 2007 Thorsten M\u00fcrell
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+@@ -37,7 +37,7 @@ import java.sql.Statement;
+ /**
+ * The dialog to ask the user to wait.
+ *
+- * @author Thorsten Mürell
++ * @author Thorsten M\u00fcrell
+ */
+ public class PleaseWaitDialog extends DialogWidget implements ActionListener {
+ private static final long serialVersionUID = 8870277695490954084L;
---
a/fw/src/main/java/net/sourceforge/squirrel_sql/fw/codereformat/CodeReformatorKernel.java
+++
b/fw/src/main/java/net/sourceforge/squirrel_sql/fw/codereformat/CodeReformatorKernel.java
-@@ -38,11 +38,11 @@
+@@ -38,11 +38,11 @@ public class CodeReformatorKernel
Vector<String> ret = new Vector<String>();
@@ -19,12 +38,21 @@
upperIn = upperIn.toUpperCase();
----
a/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/ProgressDialectExt.java
-+++
b/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/ProgressDialectExt.java
-@@ -680,7 +680,7 @@
- public String getCreateViewSQL(final String viewName, final String
definition, final String checkOption,
- final DatabaseObjectQualifier qualifier, final
SqlGenerationPreferences prefs)
+---
a/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/FirebirdDialectExt.java
++++
b/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/FirebirdDialectExt.java
+@@ -617,7 +617,7 @@ public class FirebirdDialectExt extends
+ SqlGenerationPreferences prefs)
{
+ // CREATE [UNIQUE] [ASC[ENDING] | DESC[ENDING]] INDEX index
+- // ON table (col [, col …]);
++ // ON table (col [, col \u2026]);
+
+ StringTemplate st = new
StringTemplate(ST_CREATE_INDEX_STYLE_THREE);
+ // "CREATE $unique$ $storageOption$ INDEX $indexName$ " +
+@@ -675,7 +675,7 @@ public class FirebirdDialectExt extends
+ public String getCreateViewSQL(String viewName, String definition,
String checkOption,
+ DatabaseObjectQualifier qualifier, SqlGenerationPreferences
prefs)
+ {
- // CREATE VIEW name [(view_col [, view_col …])]
+ // CREATE VIEW name [(view_col [, view_col \u2026])]
// AS <select> [WITH CHECK OPTION];
@@ -32,7 +60,7 @@
// "CREATE VIEW $viewName$ " +
---
a/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/PointbaseDialectExt.java
+++
b/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/PointbaseDialectExt.java
-@@ -649,7 +649,7 @@
+@@ -649,7 +649,7 @@ public class PointbaseDialectExt extends
public String getCreateViewSQL(final String viewName, final String
definition, final String checkOption,
final DatabaseObjectQualifier qualifier, final
SqlGenerationPreferences prefs)
{
@@ -41,42 +69,14 @@
// AS <select> [WITH CHECK OPTION];
// "CREATE VIEW $viewName$ " +
----
a/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/FirebirdDialectExt.java
-+++
b/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/FirebirdDialectExt.java
-@@ -617,7 +617,7 @@
- SqlGenerationPreferences prefs)
+---
a/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/ProgressDialectExt.java
++++
b/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/ProgressDialectExt.java
+@@ -680,7 +680,7 @@ public class ProgressDialectExt extends
+ public String getCreateViewSQL(final String viewName, final String
definition, final String checkOption,
+ final DatabaseObjectQualifier qualifier, final
SqlGenerationPreferences prefs)
{
- // CREATE [UNIQUE] [ASC[ENDING] | DESC[ENDING]] INDEX index
-- // ON table (col [, col …]);
-+ // ON table (col [, col \u2026]);
-
- StringTemplate st = new
StringTemplate(ST_CREATE_INDEX_STYLE_THREE);
- // "CREATE $unique$ $storageOption$ INDEX $indexName$ " +
-@@ -675,7 +675,7 @@
- public String getCreateViewSQL(String viewName, String definition,
String checkOption,
- DatabaseObjectQualifier qualifier, SqlGenerationPreferences
prefs)
- {
- // CREATE VIEW name [(view_col [, view_col …])]
+ // CREATE VIEW name [(view_col [, view_col \u2026])]
// AS <select> [WITH CHECK OPTION];
// "CREATE VIEW $viewName$ " +
----
a/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/PleaseWaitDialog.java
-+++
b/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/PleaseWaitDialog.java
-@@ -1,6 +1,6 @@
- package net.sourceforge.squirrel_sql.client.session.mainpanel;
- /*
-- * Copyright (C) 2007 Thorsten Mürell
-+ * Copyright (C) 2007 Thorsten M\u00fcrell
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
-@@ -37,7 +37,7 @@
- /**
- * The dialog to ask the user to wait.
- *
-- * @author Thorsten Mürell
-+ * @author Thorsten M\u00fcrell
- */
- public class PleaseWaitDialog extends DialogWidget implements ActionListener {
- private static final long serialVersionUID = 8870277695490954084L;
Modified: trunk/squirrel-sql/debian/patches/009-plugin-liclink.patch
===================================================================
--- trunk/squirrel-sql/debian/patches/009-plugin-liclink.patch 2016-11-18
09:28:32 UTC (rev 19178)
+++ trunk/squirrel-sql/debian/patches/009-plugin-liclink.patch 2016-11-22
13:07:23 UTC (rev 19179)
@@ -2,24 +2,24 @@
Forwarded: not-needed
From: Vladimir Kotov <vladi...@kotov.lv>
Last-Update: 2011-03-01
----
a/plugins/laf/src/main/java/net/sourceforge/squirrel_sql/plugins/laf/LAFPlugin.java
-+++
b/plugins/laf/src/main/java/net/sourceforge/squirrel_sql/plugins/laf/LAFPlugin.java
-@@ -156,7 +156,7 @@
- */
+---
a/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java
++++
b/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java
+@@ -153,7 +153,7 @@ public class DBCopyPlugin extends Defaul
+ @Override
public String getLicenceFileName()
{
-- return "licences.html";
+- return "license.txt";
+ return "licence.txt";
}
/**
----
a/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java
-+++
b/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java
-@@ -153,7 +153,7 @@
- @Override
+---
a/plugins/laf/src/main/java/net/sourceforge/squirrel_sql/plugins/laf/LAFPlugin.java
++++
b/plugins/laf/src/main/java/net/sourceforge/squirrel_sql/plugins/laf/LAFPlugin.java
+@@ -156,7 +156,7 @@ public class LAFPlugin extends DefaultPl
+ */
public String getLicenceFileName()
{
-- return "license.txt";
+- return "licences.html";
+ return "licence.txt";
}
Modified: trunk/squirrel-sql/debian/patches/disable_autoupdate.dpatch
===================================================================
--- trunk/squirrel-sql/debian/patches/disable_autoupdate.dpatch 2016-11-18
09:28:32 UTC (rev 19178)
+++ trunk/squirrel-sql/debian/patches/disable_autoupdate.dpatch 2016-11-22
13:07:23 UTC (rev 19179)
@@ -5,7 +5,7 @@
Last-Update: 2011-03-01
--- a/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java
+++ b/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java
-@@ -64,11 +64,6 @@
+@@ -64,11 +64,6 @@ import net.sourceforge.squirrel_sql.clie
import net.sourceforge.squirrel_sql.client.session.mainpanel.SQLHistoryItem;
import net.sourceforge.squirrel_sql.client.session.properties.EditWhereCols;
import
net.sourceforge.squirrel_sql.client.session.schemainfo.SchemaInfoCacheSerializer;
@@ -17,7 +17,7 @@
import net.sourceforge.squirrel_sql.client.util.ApplicationFiles;
import
net.sourceforge.squirrel_sql.fw.datasetviewer.CellImportExportInfoSaver;
import
net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DTProperties;
-@@ -160,10 +155,7 @@
+@@ -160,10 +155,7 @@ class Application implements IApplicatio
private List<ApplicationListener> _listeners = new
ArrayList<ApplicationListener>();
@@ -29,7 +29,7 @@
/**
* Default ctor.
*/
-@@ -216,8 +208,6 @@
+@@ -216,8 +208,6 @@ class Application implements IApplicatio
{
s_log.info(s_stringMgr.getString("Application.shutdown",
Calendar.getInstance().getTime()));
@@ -38,7 +38,7 @@
saveApplicationState();
if (!closeAllSessions()) { return false; }
-@@ -401,16 +391,7 @@
+@@ -401,16 +391,7 @@ class Application implements IApplicatio
* 3.x installations that still need to be upgraded), then it would be
safe to remove this code.
*/
private void updateLaunchScript() {
@@ -56,7 +56,7 @@
}
public IPluginManager getPluginManager()
-@@ -793,8 +774,6 @@
+@@ -793,8 +774,6 @@ class Application implements IApplicatio
}
}
@@ -65,7 +65,7 @@
}
/**
-@@ -811,6 +790,7 @@
+@@ -811,6 +790,7 @@ class Application implements IApplicatio
{
splash.indicateNewTask(taskDescription);
}
@@ -73,7 +73,7 @@
}
private void preferencesHaveChanged(PropertyChangeEvent evt)
-@@ -1212,13 +1192,4 @@
+@@ -1212,13 +1192,4 @@ class Application implements IApplicatio
_jdbcDebugType = _prefs.getJdbcDebugType();
}
}
@@ -89,7 +89,7 @@
}
---
a/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java
+++
b/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java
-@@ -473,7 +473,6 @@
+@@ -473,7 +473,6 @@ public class ActionCollection
add(new TileHorizontalAction(_app));
add(new TileVerticalAction(_app));
add(new ToggleAutoCommitAction(_app));
@@ -99,7 +99,7 @@
add(new PreviousSqlAction(_app));
---
a/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameMenuBar.java
+++
b/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameMenuBar.java
-@@ -407,8 +407,6 @@
+@@ -407,8 +407,6 @@ final class MainFrameMenuBar extends JMe
JMenu menu =
rsrc.createMenu(SquirrelResources.IMenuResourceKeys.HELP);
addToMenu(rsrc, ViewHelpAction.class, menu);
@@ -242,6 +242,199 @@
- updateController.showUpdateDialog();
- }
-}
+---
a/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GlobalPreferencesSheet.java
++++
b/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GlobalPreferencesSheet.java
+@@ -307,7 +307,6 @@ public class GlobalPreferencesSheet exte
+ _panels.add(new SQLPreferencesPanel(_app.getMainFrame()));
+ _panels.add(new ProxyPreferencesPanel());
+ _panels.add(new DataTypePreferencesPanel());
+- _panels.add(new UpdatePreferencesTab());
+
+ // Go thru all loaded plugins asking for panels.
+ PluginInfo[] plugins =
_app.getPluginManager().getPluginInformation();
+---
a/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/IUpdateSettings.java
++++ /dev/null
+@@ -1,126 +0,0 @@
+-/*
+- * Copyright (C) 2007 Rob Manning
+- * manni...@users.sourceforge.net
+- *
+- * 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.preferences;
+-
+-
+-/**
+- * Interface for settings pertaining to software updates.
+- */
+-public interface IUpdateSettings
+-{
+-
+- /**
+- * @return the updateServer
+- */
+- public abstract String getUpdateServer();
+-
+- /**
+- * @param updateServer the updateServer to set
+- */
+- public abstract void setUpdateServer(String updateServer);
+-
+- /**
+- * @return the updateServerPort
+- */
+- public abstract String getUpdateServerPort();
+-
+- /**
+- * @param updateServerPort the updateServerPort to set
+- */
+- public abstract void setUpdateServerPort(String updateServerPort);
+-
+- /**
+- * @return the updateServerPath
+- */
+- public abstract String getUpdateServerPath();
+-
+- /**
+- * @param updateServerPath the updateServerPath to set
+- */
+- public abstract void setUpdateServerPath(String updateServerPath);
+-
+- /**
+- * @return the updateServerChannel
+- */
+- public abstract String getUpdateServerChannel();
+-
+- /**
+- * @param updateServerChannel the updateServerChannel to set
+- */
+- public abstract void setUpdateServerChannel(String updateServerChannel);
+-
+- /**
+- * @return the enableAutomaticUpdates
+- */
+- public abstract boolean isEnableAutomaticUpdates();
+-
+- /**
+- * @param enableAutomaticUpdates the enableAutomaticUpdates to set
+- */
+- public abstract void setEnableAutomaticUpdates(boolean
enableAutomaticUpdates);
+-
+- /**
+- * @return the updateCheckFrequency
+- */
+- public abstract String getUpdateCheckFrequency();
+-
+- /**
+- * @param updateCheckFrequency the updateCheckFrequency to set
+- */
+- public abstract void setUpdateCheckFrequency(String
updateCheckFrequency);
+-
+- /**
+- * @return the lastUpdateCheckTimeMillis
+- */
+- public abstract String getLastUpdateCheckTimeMillis();
+-
+- /**
+- * @param lastUpdateCheckTimeMillis the lastUpdateCheckTimeMillis to set
+- */
+- public abstract void setLastUpdateCheckTimeMillis(String
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 abstract boolean isRemoteUpdateSite();
+-
+- /**
+- * 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 abstract void setRemoteUpdateSite(boolean isRemoteUpdateSite);
+-
+- /**
+- * @return the fileSystemUpdatePath
+- */
+- public abstract String getFileSystemUpdatePath();
+-
+- /**
+- * @param fileSystemUpdatePath the fileSystemUpdatePath to set
+- */
+- public abstract void setFileSystemUpdatePath(String
fileSystemUpdatePath);
+-
+-}
+\ No newline at end of file
+---
a/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferences.java
++++
b/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferences.java
+@@ -63,7 +63,6 @@ public class SquirrelPreferences impleme
+ String PLUGIN_OBJECTS = "pluginObjects";
+ String PLUGIN_STATUSES = "pluginStatuses";
+ String PROXY = "proxyPerferences";
+- String UPDATE = "updatePreferences";
+ String SCROLLABLE_TABBED_PANES = "getUseScrollableTabbedPanes";
+ String SESSION_PROPERTIES = "sessionProperties";
+ String SHOW_ALIASES_TOOL_BAR = "showAliasesToolBar";
+@@ -182,8 +181,6 @@ public class SquirrelPreferences impleme
+ /** Proxy settings. */
+ private ProxySettings _proxySettings = new ProxySettings();
+
+- /** Software update settings */
+- private IUpdateSettings _updateSettings = new UpdateSettings();
+
+ /** Show loaded drivers only in the Drivers window. */
+ private boolean _showLoadedDriversOnly;
+@@ -617,22 +614,6 @@ public class SquirrelPreferences impleme
+ {
+ return (ProxySettings)_proxySettings.clone();
+ }
+-
+- public IUpdateSettings getUpdateSettings() {
+- return new UpdateSettings(_updateSettings);
+- }
+-
+- public synchronized void setUpdateSettings(IUpdateSettings data)
+- {
+- if (data == null)
+- {
+- data = new UpdateSettings();
+- }
+- final IUpdateSettings oldValue = _updateSettings;
+- _updateSettings= data;
+- getPropertyChangeReporter().firePropertyChange(IPropertyNames.UPDATE,
+- oldValue, _updateSettings);
+- }
+
+
+ public synchronized void setProxySettings(ProxySettings data)
+---
a/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferencesBeanInfo.java
++++
b/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferencesBeanInfo.java
+@@ -79,8 +79,6 @@ public class SquirrelPreferencesBeanInfo
+ "setActionKeys",
"getActionKeys", "setActionKeys"),
+ new PropertyDescriptor(PROXY,
SquirrelPreferences.class, "getProxySettings",
+ "setProxySettings"),
+- new PropertyDescriptor(UPDATE,
SquirrelPreferences.class, "getUpdateSettings",
+- "setUpdateSettings"),
+ new
PropertyDescriptor(SHOW_LOADED_DRIVERS_ONLY, SquirrelPreferences.class,
+
"getShowLoadedDriversOnly", "setShowLoadedDriversOnly"),
+ new
PropertyDescriptor(MAXIMIMIZE_SESSION_SHEET_ON_OPEN, SquirrelPreferences.class,
---
a/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/UpdateChannelComboBoxEntry.java
+++ /dev/null
@@ -1,81 +0,0 @@
@@ -1434,199 +1627,6 @@
-
-}
\ No newline at end of file
----
a/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GlobalPreferencesSheet.java
-+++
b/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GlobalPreferencesSheet.java
-@@ -307,7 +307,6 @@
- _panels.add(new SQLPreferencesPanel(_app.getMainFrame()));
- _panels.add(new ProxyPreferencesPanel());
- _panels.add(new DataTypePreferencesPanel());
-- _panels.add(new UpdatePreferencesTab());
-
- // Go thru all loaded plugins asking for panels.
- PluginInfo[] plugins =
_app.getPluginManager().getPluginInformation();
----
a/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/IUpdateSettings.java
-+++ /dev/null
-@@ -1,126 +0,0 @@
--/*
-- * Copyright (C) 2007 Rob Manning
-- * manni...@users.sourceforge.net
-- *
-- * 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.preferences;
--
--
--/**
-- * Interface for settings pertaining to software updates.
-- */
--public interface IUpdateSettings
--{
--
-- /**
-- * @return the updateServer
-- */
-- public abstract String getUpdateServer();
--
-- /**
-- * @param updateServer the updateServer to set
-- */
-- public abstract void setUpdateServer(String updateServer);
--
-- /**
-- * @return the updateServerPort
-- */
-- public abstract String getUpdateServerPort();
--
-- /**
-- * @param updateServerPort the updateServerPort to set
-- */
-- public abstract void setUpdateServerPort(String updateServerPort);
--
-- /**
-- * @return the updateServerPath
-- */
-- public abstract String getUpdateServerPath();
--
-- /**
-- * @param updateServerPath the updateServerPath to set
-- */
-- public abstract void setUpdateServerPath(String updateServerPath);
--
-- /**
-- * @return the updateServerChannel
-- */
-- public abstract String getUpdateServerChannel();
--
-- /**
-- * @param updateServerChannel the updateServerChannel to set
-- */
-- public abstract void setUpdateServerChannel(String updateServerChannel);
--
-- /**
-- * @return the enableAutomaticUpdates
-- */
-- public abstract boolean isEnableAutomaticUpdates();
--
-- /**
-- * @param enableAutomaticUpdates the enableAutomaticUpdates to set
-- */
-- public abstract void setEnableAutomaticUpdates(boolean
enableAutomaticUpdates);
--
-- /**
-- * @return the updateCheckFrequency
-- */
-- public abstract String getUpdateCheckFrequency();
--
-- /**
-- * @param updateCheckFrequency the updateCheckFrequency to set
-- */
-- public abstract void setUpdateCheckFrequency(String
updateCheckFrequency);
--
-- /**
-- * @return the lastUpdateCheckTimeMillis
-- */
-- public abstract String getLastUpdateCheckTimeMillis();
--
-- /**
-- * @param lastUpdateCheckTimeMillis the lastUpdateCheckTimeMillis to set
-- */
-- public abstract void setLastUpdateCheckTimeMillis(String
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 abstract boolean isRemoteUpdateSite();
--
-- /**
-- * 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 abstract void setRemoteUpdateSite(boolean isRemoteUpdateSite);
--
-- /**
-- * @return the fileSystemUpdatePath
-- */
-- public abstract String getFileSystemUpdatePath();
--
-- /**
-- * @param fileSystemUpdatePath the fileSystemUpdatePath to set
-- */
-- public abstract void setFileSystemUpdatePath(String
fileSystemUpdatePath);
--
--}
-\ No newline at end of file
----
a/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferencesBeanInfo.java
-+++
b/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferencesBeanInfo.java
-@@ -79,8 +79,6 @@
- "setActionKeys",
"getActionKeys", "setActionKeys"),
- new PropertyDescriptor(PROXY,
SquirrelPreferences.class, "getProxySettings",
- "setProxySettings"),
-- new PropertyDescriptor(UPDATE,
SquirrelPreferences.class, "getUpdateSettings",
-- "setUpdateSettings"),
- new
PropertyDescriptor(SHOW_LOADED_DRIVERS_ONLY, SquirrelPreferences.class,
-
"getShowLoadedDriversOnly", "setShowLoadedDriversOnly"),
- new
PropertyDescriptor(MAXIMIMIZE_SESSION_SHEET_ON_OPEN, SquirrelPreferences.class,
----
a/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferences.java
-+++
b/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferences.java
-@@ -63,7 +63,6 @@
- String PLUGIN_OBJECTS = "pluginObjects";
- String PLUGIN_STATUSES = "pluginStatuses";
- String PROXY = "proxyPerferences";
-- String UPDATE = "updatePreferences";
- String SCROLLABLE_TABBED_PANES = "getUseScrollableTabbedPanes";
- String SESSION_PROPERTIES = "sessionProperties";
- String SHOW_ALIASES_TOOL_BAR = "showAliasesToolBar";
-@@ -182,8 +181,6 @@
- /** Proxy settings. */
- private ProxySettings _proxySettings = new ProxySettings();
-
-- /** Software update settings */
-- private IUpdateSettings _updateSettings = new UpdateSettings();
-
- /** Show loaded drivers only in the Drivers window. */
- private boolean _showLoadedDriversOnly;
-@@ -617,22 +614,6 @@
- {
- return (ProxySettings)_proxySettings.clone();
- }
--
-- public IUpdateSettings getUpdateSettings() {
-- return new UpdateSettings(_updateSettings);
-- }
--
-- public synchronized void setUpdateSettings(IUpdateSettings data)
-- {
-- if (data == null)
-- {
-- data = new UpdateSettings();
-- }
-- final IUpdateSettings oldValue = _updateSettings;
-- _updateSettings= data;
-- getPropertyChangeReporter().firePropertyChange(IPropertyNames.UPDATE,
-- oldValue, _updateSettings);
-- }
-
-
- public synchronized void setProxySettings(ProxySettings data)
---
a/app/src/main/java/net/sourceforge/squirrel_sql/client/update/DownloadStatusEventHandler.java
+++ /dev/null
@@ -1,183 +0,0 @@
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
