Author: jflesch
Date: 2006-08-03 15:11:11 +0000 (Thu, 03 Aug 2006)
New Revision: 9860
Added:
trunk/apps/Thaw/src/thaw/core/I18n.java
Removed:
trunk/apps/Thaw/src/thaw/i18n/I18n.java
Modified:
trunk/apps/Thaw/src/thaw/core/ConfigWindow.java
trunk/apps/Thaw/src/thaw/core/Core.java
trunk/apps/Thaw/src/thaw/core/Main.java
trunk/apps/Thaw/src/thaw/core/MainWindow.java
trunk/apps/Thaw/src/thaw/core/NodeConfigPanel.java
trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java
trunk/apps/Thaw/src/thaw/core/QueueKeeper.java
trunk/apps/Thaw/src/thaw/core/ThawConfigPanel.java
trunk/apps/Thaw/src/thaw/core/WarningWindow.java
trunk/apps/Thaw/src/thaw/plugins/Console.java
trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java
trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java
trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java
trunk/apps/Thaw/src/thaw/plugins/Restarter.java
trunk/apps/Thaw/src/thaw/plugins/StatusBar.java
trunk/apps/Thaw/src/thaw/plugins/fetchPlugin/FetchPanel.java
trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DetailPanel.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DragAndDropManager.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
Log:
Moving I18n.java for a security reason
Modified: trunk/apps/Thaw/src/thaw/core/ConfigWindow.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/ConfigWindow.java 2006-08-03 15:08:14 UTC
(rev 9859)
+++ trunk/apps/Thaw/src/thaw/core/ConfigWindow.java 2006-08-03 15:11:11 UTC
(rev 9860)
@@ -12,7 +12,6 @@
import java.awt.GridLayout;
import javax.swing.JOptionPane;
-import thaw.i18n.I18n;
/**
Modified: trunk/apps/Thaw/src/thaw/core/Core.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Core.java 2006-08-03 15:08:14 UTC (rev
9859)
+++ trunk/apps/Thaw/src/thaw/core/Core.java 2006-08-03 15:11:11 UTC (rev
9860)
@@ -11,8 +11,6 @@
import javax.swing.UIManager.LookAndFeelInfo;
import javax.swing.JOptionPane;
-
-import thaw.i18n.I18n;
import thaw.fcp.*;
/**
Copied: trunk/apps/Thaw/src/thaw/core/I18n.java (from rev 9850,
trunk/apps/Thaw/src/thaw/i18n/I18n.java)
Modified: trunk/apps/Thaw/src/thaw/core/Main.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Main.java 2006-08-03 15:08:14 UTC (rev
9859)
+++ trunk/apps/Thaw/src/thaw/core/Main.java 2006-08-03 15:11:11 UTC (rev
9860)
@@ -4,7 +4,6 @@
import javax.swing.UIManager.LookAndFeelInfo;
import java.util.Locale;
-import thaw.i18n.I18n;
/**
* Main class. Only used to display some informations and init the core.
Modified: trunk/apps/Thaw/src/thaw/core/MainWindow.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/MainWindow.java 2006-08-03 15:08:14 UTC
(rev 9859)
+++ trunk/apps/Thaw/src/thaw/core/MainWindow.java 2006-08-03 15:11:11 UTC
(rev 9860)
@@ -18,9 +18,7 @@
import java.awt.Font;
import javax.swing.Box;
-import thaw.i18n.I18n;
-
/**
* MainWindow. This class create the main window.
*
Modified: trunk/apps/Thaw/src/thaw/core/NodeConfigPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/NodeConfigPanel.java 2006-08-03 15:08:14 UTC
(rev 9859)
+++ trunk/apps/Thaw/src/thaw/core/NodeConfigPanel.java 2006-08-03 15:11:11 UTC
(rev 9860)
@@ -12,9 +12,6 @@
import java.util.Observer;
import java.util.Observable;
-import thaw.i18n.I18n;
-
-
/**
* NodeConfigPanel. Creates and manages the panel containing all the things to
configure
* the settings to access the node.
Modified: trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java 2006-08-03
15:08:14 UTC (rev 9859)
+++ trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java 2006-08-03
15:11:11 UTC (rev 9860)
@@ -19,9 +19,7 @@
import java.util.Vector;
import java.util.Iterator;
-import thaw.i18n.I18n;
-
/**
* PluginConfigPanel. Creates and manages the panel containing all the things
to configure
* the list of plugins.
Modified: trunk/apps/Thaw/src/thaw/core/QueueKeeper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/QueueKeeper.java 2006-08-03 15:08:14 UTC
(rev 9859)
+++ trunk/apps/Thaw/src/thaw/core/QueueKeeper.java 2006-08-03 15:11:11 UTC
(rev 9860)
@@ -23,8 +23,6 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-
-
import thaw.fcp.*;
/**
Modified: trunk/apps/Thaw/src/thaw/core/ThawConfigPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/ThawConfigPanel.java 2006-08-03 15:08:14 UTC
(rev 9859)
+++ trunk/apps/Thaw/src/thaw/core/ThawConfigPanel.java 2006-08-03 15:11:11 UTC
(rev 9860)
@@ -11,8 +11,6 @@
import java.util.Observer;
import java.util.Observable;
-import thaw.i18n.I18n;
-
/**
* Creates and manages the panel containing all the things to configure
related to Thaw and only Thaw.
*/
Modified: trunk/apps/Thaw/src/thaw/core/WarningWindow.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/WarningWindow.java 2006-08-03 15:08:14 UTC
(rev 9859)
+++ trunk/apps/Thaw/src/thaw/core/WarningWindow.java 2006-08-03 15:11:11 UTC
(rev 9860)
@@ -2,8 +2,6 @@
import javax.swing.JOptionPane;
-import thaw.i18n.I18n;
-
/**
* Use to create a warning popup.
* Currently this popup is simple as possible, but
Deleted: trunk/apps/Thaw/src/thaw/i18n/I18n.java
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/I18n.java 2006-08-03 15:08:14 UTC (rev
9859)
+++ trunk/apps/Thaw/src/thaw/i18n/I18n.java 2006-08-03 15:11:11 UTC (rev
9860)
@@ -1,74 +0,0 @@
-/*
- * Thaw - A tool to insert and fetch files on freenet
- * by Jerome Flesch
- * 2006(c) Freenet project
- * ==================================================
- *
- * This file was originally created by David Roden and next was adapted to
Thaw by Jerome Flesch.
- *
- * Copyright (C) 2006 David Roden
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-package thaw.i18n;
-
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-import thaw.core.Logger;
-
-/**
- * @author David Roden <droden at gmail.com>
- * @version $Id: I18n.java 355 2006-03-24 15:04:11Z bombe $
- */
-public class I18n {
-
- private static Locale currentLocale;
-
- public I18n() {
-
- }
-
- public static Locale getLocale() {
- if (currentLocale == null)
- currentLocale = Locale.getDefault();
- return currentLocale;
- }
-
- public static void setLocale(Locale locale) {
- currentLocale = locale;
- Locale.setDefault(locale);
- }
-
- public static ResourceBundle getResourceBundle() {
- return getResourceBundle(getLocale());
- }
-
- public static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle("thaw.i18n.thaw", getLocale());
- }
-
- public static String getMessage(String key) {
- try {
- return getResourceBundle().getString(key);
- } catch(Exception e) {
- Logger.warning(new I18n(),/* we need a ref -> random
ref -> this is *bad* */
- "Unable to find translation for
'"+key+"'");
- return key;
- }
- }
-
-}
Modified: trunk/apps/Thaw/src/thaw/plugins/Console.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/Console.java 2006-08-03 15:08:14 UTC
(rev 9859)
+++ trunk/apps/Thaw/src/thaw/plugins/Console.java 2006-08-03 15:11:11 UTC
(rev 9860)
@@ -16,7 +16,6 @@
import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
-import thaw.i18n.I18n;
import thaw.core.*;
Modified: trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java 2006-08-03 15:08:14 UTC
(rev 9859)
+++ trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java 2006-08-03 15:11:11 UTC
(rev 9860)
@@ -3,7 +3,6 @@
import javax.swing.JPanel;
import thaw.core.*;
-import thaw.i18n.I18n;
import thaw.plugins.fetchPlugin.*;
import thaw.fcp.*;
Modified: trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java 2006-08-03 15:08:14 UTC
(rev 9859)
+++ trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java 2006-08-03 15:11:11 UTC
(rev 9860)
@@ -14,7 +14,6 @@
import java.io.File;
import thaw.core.*;
-import thaw.i18n.I18n;
import thaw.plugins.insertPlugin.*;
import thaw.fcp.*;
Modified: trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java 2006-08-03 15:08:14 UTC
(rev 9859)
+++ trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java 2006-08-03 15:11:11 UTC
(rev 9860)
@@ -15,7 +15,6 @@
import java.beans.PropertyChangeEvent;
import thaw.core.*;
-import thaw.i18n.I18n;
import thaw.plugins.queueWatcher.*;
import thaw.fcp.*;
Modified: trunk/apps/Thaw/src/thaw/plugins/Restarter.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/Restarter.java 2006-08-03 15:08:14 UTC
(rev 9859)
+++ trunk/apps/Thaw/src/thaw/plugins/Restarter.java 2006-08-03 15:11:11 UTC
(rev 9860)
@@ -12,7 +12,6 @@
import java.util.Observable;
import java.util.Random;
-import thaw.i18n.I18n;
import thaw.core.*;
import thaw.fcp.*;
Modified: trunk/apps/Thaw/src/thaw/plugins/StatusBar.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/StatusBar.java 2006-08-03 15:08:14 UTC
(rev 9859)
+++ trunk/apps/Thaw/src/thaw/plugins/StatusBar.java 2006-08-03 15:11:11 UTC
(rev 9860)
@@ -3,7 +3,6 @@
import java.util.Vector;
import java.util.Iterator;
-import thaw.i18n.I18n;
import thaw.core.*;
import thaw.fcp.*;
Modified: trunk/apps/Thaw/src/thaw/plugins/fetchPlugin/FetchPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/fetchPlugin/FetchPanel.java
2006-08-03 15:08:14 UTC (rev 9859)
+++ trunk/apps/Thaw/src/thaw/plugins/fetchPlugin/FetchPanel.java
2006-08-03 15:11:11 UTC (rev 9860)
@@ -28,7 +28,6 @@
import thaw.core.*;
import thaw.plugins.FetchPlugin;
-import thaw.i18n.I18n;
public class FetchPanel implements java.awt.event.ActionListener {
Modified: trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
2006-08-03 15:08:14 UTC (rev 9859)
+++ trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
2006-08-03 15:11:11 UTC (rev 9860)
@@ -22,7 +22,6 @@
import java.util.Vector;
import thaw.core.*;
-import thaw.i18n.I18n;
import thaw.plugins.InsertPlugin;
import thaw.fcp.*;
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DetailPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DetailPanel.java
2006-08-03 15:08:14 UTC (rev 9859)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DetailPanel.java
2006-08-03 15:11:11 UTC (rev 9860)
@@ -12,7 +12,6 @@
import java.util.Observable;
import thaw.core.*;
-import thaw.i18n.I18n;
import thaw.fcp.*;
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DragAndDropManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DragAndDropManager.java
2006-08-03 15:08:14 UTC (rev 9859)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DragAndDropManager.java
2006-08-03 15:11:11 UTC (rev 9860)
@@ -23,7 +23,6 @@
import thaw.core.*;
import thaw.plugins.QueueWatcher;
import thaw.fcp.*;
-import thaw.i18n.I18n;
public class DragAndDropManager implements DragGestureListener,
DragSourceListener {
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
2006-08-03 15:08:14 UTC (rev 9859)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
2006-08-03 15:11:11 UTC (rev 9860)
@@ -37,7 +37,6 @@
import java.io.File;
import thaw.core.*;
-import thaw.i18n.I18n;
import thaw.fcp.*;
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2006-08-03 15:08:14 UTC (rev 9859)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2006-08-03 15:11:11 UTC (rev 9860)
@@ -10,7 +10,6 @@
import javax.swing.JProgressBar;
import thaw.core.*;
-import thaw.i18n.I18n;
import thaw.fcp.*;
public class QueueTableModel extends javax.swing.table.AbstractTableModel
implements Observer {
