Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java (revision 7025)
+++ trunk/src/org/openstreetmap/josm/Main.java (revision 7026)
@@ -56,5 +56,4 @@
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.Preferences;
-import org.openstreetmap.josm.data.ServerSidePreferences;
import org.openstreetmap.josm.data.UndoRedoHandler;
import org.openstreetmap.josm.data.ViewportData;
@@ -175,9 +174,4 @@
/**
- * Set to true, when in applet mode
- */
- public static boolean applet = false;
-
- /**
* The toolbar preference control to register new actions.
*/
@@ -421,13 +415,4 @@
*/
public static boolean isOpenjdk;
-
- /**
- * Initializes {@code Main.pref} in applet context.
- * @param serverURL The server URL hosting the user preferences.
- * @since 6471
- */
- public static void initAppletPreferences(URL serverURL) {
- Main.pref = new ServerSidePreferences(serverURL);
- }
/**
Index: trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 7025)
+++ trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 7026)
@@ -77,5 +77,5 @@
@Override
protected void updateEnabledState() {
- setEnabled(! Main.applet);
+ setEnabled(true);
}
Index: trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java (revision 7025)
+++ trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java (revision 7026)
@@ -48,11 +48,6 @@
panel.add(name);
JCheckBox filerename = new JCheckBox(tr("Also rename the file"));
- if (Main.applet) {
- filerename.setEnabled(false);
- filerename.setSelected(false);
- } else {
- panel.add(filerename);
- filerename.setEnabled(file != null);
- }
+ panel.add(filerename);
+ filerename.setEnabled(file != null);
if (filerename.isEnabled()) {
filerename.setSelected(Main.pref.getBoolean("layer.rename-file", true));
Index: trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (revision 7025)
+++ trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (revision 7026)
@@ -105,8 +105,4 @@
@Override
protected void updateEnabledState() {
- if (Main.applet) {
- setEnabled(false);
- return;
- }
boolean check = Main.isDisplayingMapView()
&& Main.map.mapView.getActiveLayer() != null;
Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 7025)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 7026)
@@ -689,6 +689,4 @@
updateSystemProperties();
- if(Main.applet)
- return;
File prefFile = getPreferenceFile();
@@ -724,15 +722,13 @@
public void load() throws Exception {
settingsMap.clear();
- if (!Main.applet) {
- File pref = getPreferenceFile();
- BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(pref), Utils.UTF_8));
- try {
- validateXML(in);
- Utils.close(in);
- in = new BufferedReader(new InputStreamReader(new FileInputStream(pref), Utils.UTF_8));
- fromXML(in);
- } finally {
- Utils.close(in);
- }
+ File pref = getPreferenceFile();
+ BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(pref), Utils.UTF_8));
+ try {
+ validateXML(in);
+ Utils.close(in);
+ in = new BufferedReader(new InputStreamReader(new FileInputStream(pref), Utils.UTF_8));
+ fromXML(in);
+ } finally {
+ Utils.close(in);
}
updateSystemProperties();
@@ -741,6 +737,4 @@
public void init(boolean reset){
- if(Main.applet)
- return;
// get the preferences.
File prefDir = getPreferencesDirFile();
Index: trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java (revision 7025)
+++ (revision )
@@ -1,192 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.StringReader;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-
-import javax.swing.JOptionPane;
-import javax.xml.stream.XMLStreamException;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.io.OsmConnection;
-import org.openstreetmap.josm.tools.Base64;
-import org.openstreetmap.josm.tools.Utils;
-
-/**
- * This class tweak the Preferences class to provide server side preference settings, as example
- * used in the applet version.
- *
- * @author Imi
- */
-public class ServerSidePreferences extends Preferences {
- public static class MissingPassword extends Exception{
- public final String realm;
- public MissingPassword(String r) {
- realm = r;
- }
- }
-
- private final Connection connection;
-
- private class Connection extends OsmConnection {
- URL serverUrl;
- public Connection(URL serverUrl) {
- this.serverUrl = serverUrl;
- }
- public String download() throws MissingPassword {
- try {
- Main.info("reading preferences from "+serverUrl);
- URLConnection con = serverUrl.openConnection();
- String username = get("applet.username");
- String password = get("applet.password");
- if(password.isEmpty() && username.isEmpty()) {
- con.addRequestProperty("Authorization", "Basic "+Base64.encode(username+":"+password));
- }
- con.connect();
- if(username.isEmpty() && con instanceof HttpURLConnection
- && ((HttpURLConnection) con).getResponseCode()
- == HttpURLConnection.HTTP_UNAUTHORIZED) {
- String t = ((HttpURLConnection) con).getHeaderField("WWW-Authenticate");
- t = t.replace("Basic realm=\"","").replace("\"","");
- throw new MissingPassword(t);
- }
- BufferedReader reader = new BufferedReader(new InputStreamReader(con.getInputStream(), Utils.UTF_8));
- StringBuilder b = new StringBuilder();
- try {
- for (String line = reader.readLine(); line != null; line = reader.readLine()) {
- b.append(line);
- b.append("\n");
- }
- } finally {
- reader.close();
- }
- if (con instanceof HttpURLConnection) {
- ((HttpURLConnection) con).disconnect();
- }
- return b.toString();
- } catch (IOException e) {
- Main.error(e);
- }
- return null;
- }
- public void upload(String s) {
- try {
- URL u = new URL(getPreferencesDir());
- Main.info("uploading preferences to "+u);
- HttpURLConnection con = (HttpURLConnection)u.openConnection();
- String username = get("applet.username");
- String password = get("applet.password");
- if(password.isEmpty() && username.isEmpty()) {
- con.addRequestProperty("Authorization", "Basic "+Base64.encode(username+":"+password));
- }
- con.setRequestMethod("POST");
- con.setDoOutput(true);
- con.connect();
- PrintWriter out = new PrintWriter(new OutputStreamWriter(con.getOutputStream(), Utils.UTF_8));
- out.println(s);
- Utils.close(out);
- Utils.close(con.getInputStream());
- con.disconnect();
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Preferences stored on {0}", u.getHost()),
- tr("Information"),
- JOptionPane.INFORMATION_MESSAGE
- );
- } catch (Exception e) {
- Main.error(e);
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Could not upload preferences. Reason: {0}", e.getMessage()),
- tr("Error"),
- JOptionPane.ERROR_MESSAGE
- );
- }
- }
- }
-
- /**
- * Constructs a new {@code ServerSidePreferences}.
- * @param serverUrl The server URL hosting the user preferences.
- */
- public ServerSidePreferences(URL serverUrl) {
- Connection connection = null;
- try {
- connection = new Connection(new URL(serverUrl+"user/preferences"));
- } catch (MalformedURLException e) {
- Main.error(e);
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Could not load preferences from server."),
- tr("Error"),
- JOptionPane.ERROR_MESSAGE
- );
- }
- this.connection = connection;
- }
-
- @Override public String getPreferencesDir() {
- return connection.serverUrl.toString();
- }
-
- /**
- * Do nothing on load. Preferences are loaded with download().
- */
- @Override public void load() {
- }
-
- /**
- * Do nothing on save. Preferences are uploaded using upload().
- */
- @Override public void save() {
- }
-
- public void download(String userName, String password) {
- if (!settingsMap.containsKey("applet.username") && userName != null) {
- settingsMap.put("applet.username", new StringSetting(userName));
- }
- if (!settingsMap.containsKey("applet.password") && password != null) {
- settingsMap.put("applet.password", new StringSetting(password));
- }
- try {
- download();
- } catch (MissingPassword e) {
- Main.warn(e);
- }
- }
-
- public boolean download() throws MissingPassword {
- resetToDefault();
- String cont = connection.download();
- if (cont == null) return false;
- Reader in = new StringReader(cont);
- boolean res = false;
- try {
- fromXML(in);
- } catch (RuntimeException | XMLStreamException e) {
- Main.error(e);
- }
- return res;
- }
-
- /**
- * Use this instead of save() for the ServerSidePreferences, since uploads
- * are costly while save is called often.
- *
- * This is triggered by an explicit menu option.
- */
- public void upload() {
- connection.upload(toXML(true));
- }
-}
Index: trunk/src/org/openstreetmap/josm/gui/MainApplet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplet.java (revision 7025)
+++ (revision )
@@ -1,206 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.applet.AppletContext;
-import java.applet.AppletStub;
-import java.awt.GridBagLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.io.File;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
-
-import javax.swing.JApplet;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.data.ServerSidePreferences;
-import org.openstreetmap.josm.gui.MainApplication.Option;
-import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
-import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.I18n;
-import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.tools.Utils;
-
-public class MainApplet extends JApplet {
-
- static final JFrame frame = new JFrame("Java OpenStreetMap Editor");
-
- public static final class UploadPreferencesAction extends JosmAction {
- /**
- * Constructs a new {@code UploadPreferencesAction}.
- */
- public UploadPreferencesAction() {
- super(tr("Upload Preferences"), "upload-preferences", tr("Upload the current preferences to the server"),
- Shortcut.registerShortcut("applet:uploadprefs", tr("Upload Preferences"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), true);
- }
- @Override
- public void actionPerformed(ActionEvent e) {
- ((ServerSidePreferences)Main.pref).upload();
- }
- }
-
- private final class MainCaller extends Main {
- private MainCaller(Map> mapargs) {
- addListener();
- setContentPane(contentPanePrivate);
- setJMenuBar(menu);
- postConstructorProcessCmdLine(mapargs);
- }
- }
-
- private static final String[][] paramInfo = {
- {"username", tr("string"), tr("Name of the user.")},
- {"password", tr("string"), tr("OSM Password.")},
- {"geometry", tr("string"), tr("Resize the applet to the given geometry (format: WIDTHxHEIGHT)")},
- {"download", tr("string;string;..."), tr("Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a filename")},
- {"downloadgps", tr("string;string;..."), tr("Download each as raw gps. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a filename")},
- {"selection", tr("string;string;..."), tr("Add each to the initial selection. Can be a google-like search string or an URL which returns osm-xml")},
- {"reset-preferences", tr("any"),tr("If specified, reset the configuration instead of reading it.")}
- };
-
- private Map> args = new HashMap<>();
-
- @Override public String[][] getParameterInfo() {
- return paramInfo;
- }
-
- @Override public void init() {
- for (String[] s : paramInfo) {
- Collection p = readParameter(s[0], args.get(s[0]));
- if (p != null) {
- args.put(s[0], p);
- }
- }
- if (!args.containsKey("geometry") && getParameter("width") != null && getParameter("height") != null) {
- args.put("geometry", Arrays.asList(new String[]{getParameter("width")+"x"+getParameter("height")}));
- }
- }
-
- @Override public void start() {
- I18n.init();
- Main.checkJavaVersion();
-
- String url = getParameter("load_url");
- if(url != null)
- args.put("download", Arrays.asList(new String[]{url}));
-
- // initialize the platform hook, and
- Main.determinePlatformHook();
- // call the really early hook before we do anything else
- Main.platform.preStartupHook();
-
- Main.initAppletPreferences(getCodeBase());
-
- String lang = getParameter("language");
- I18n.set(lang != null ? lang : Main.pref.get("language", null));
- Main.pref.updateSystemProperties();
-
- try
- {
- ((ServerSidePreferences)Main.pref).download();
- } catch (ServerSidePreferences.MissingPassword e) {
- String username = args.containsKey("username") ? args.get("username").iterator().next() : null;
- String password = args.containsKey("password") ? args.get("password").iterator().next() : null;
- if (username == null || password == null) {
- JPanel p = new JPanel(new GridBagLayout());
- p.add(new JLabel(tr(e.realm)), GBC.eol().fill(GBC.HORIZONTAL));
- p.add(new JLabel(tr("Username")), GBC.std().insets(0,0,20,0));
- JosmTextField user = new JosmTextField(username == null ? "" : username);
- p.add(user, GBC.eol().fill(GBC.HORIZONTAL));
- p.add(new JLabel(tr("Password")), GBC.std().insets(0,0,20,0));
- JosmPasswordField pass = new JosmPasswordField(password == null ? "" : password);
- p.add(pass, GBC.eol().fill(GBC.HORIZONTAL));
- JOptionPane.showMessageDialog(null, p);
- username = user.getText();
- if("".equals(username))
- username = null;
- password = new String(pass.getPassword());
- if("".equals(password))
- password = null;
- }
- if (username != null && password != null) {
- ((ServerSidePreferences)Main.pref).download(username, password);
- }
- }
-
- Main.preConstructorInit(Option.fromStringMap(args));
- Main.pref.updateSystemProperties();
- Main.parent = frame;
-
- new MainCaller(Option.fromStringMap(args));
-
- MainMenu m = Main.main.menu; // shortcut
-
- // remove offending stuff from JOSM (that would break the SecurityManager)
- m.editMenu.add(new UploadPreferencesAction());
- m.openFile.setEnabled(false);
- m.exit.setEnabled(false);
- m.save.setEnabled(false);
- m.saveAs.setEnabled(false);
- m.gpxExport.setEnabled(false);
- }
-
- private Collection readParameter(String s, Collection v) {
- String param = getParameter(s);
- if (param != null) {
- if (v == null) {
- v = new LinkedList<>();
- }
- v.addAll(Arrays.asList(param.split(";")));
- }
- return v;
- }
-
- public static void main(String[] args) {
- Main.applet = true;
- MainApplet applet = new MainApplet();
- Main.initAppletPreferences(applet.getCodeBase());
- applet.setStub(new AppletStub() {
- @Override
- public void appletResize(int w, int h) {
- frame.setSize(w, h);
- }
-
- @Override
- public AppletContext getAppletContext() {
- return null;
- }
-
- @Override
- public URL getCodeBase() {
- return Utils.fileToURL(new File("."));
- }
-
- @Override
- public URL getDocumentBase() {
- return getCodeBase();
- }
-
- @Override
- public String getParameter(String k) {
- return null;
- }
-
- @Override
- public boolean isActive() {
- return true;
- }
- });
- applet.init();
- applet.start();
- frame.setContentPane(applet);
- frame.setVisible(true);
- }
-}
Index: trunk/src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 7025)
+++ trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 7026)
@@ -671,5 +671,5 @@
viewportFollowToggleAction.addButtonModel(vft.getModel());
- if(!Main.applet && Main.platform.canFullscreen()) {
+ if(Main.platform.canFullscreen()) {
// -- fullscreen toggle action
fullscreenToggleAction = new FullscreenToggleAction();
Index: trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java (revision 7025)
+++ trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java (revision 7026)
@@ -181,57 +181,4 @@
}
}
- else if(!Main.applet) { /* FIXME: remove else clause after spring 2011, but fix windows installer before */
- File bookmarkFile = new File(Main.pref.getPreferencesDir(),"bookmarks");
- try {
- LinkedList bookmarks = new LinkedList<>();
- if (bookmarkFile.exists()) {
- Main.info("Try loading obsolete bookmarks file");
- BufferedReader in = new BufferedReader(new InputStreamReader(
- new FileInputStream(bookmarkFile), Utils.UTF_8));
-
- for (String line = in.readLine(); line != null; line = in.readLine()) {
- Matcher m = Pattern.compile("^(.+)[,\u001e](-?\\d+.\\d+)[,\u001e](-?\\d+.\\d+)[,\u001e](-?\\d+.\\d+)[,\u001e](-?\\d+.\\d+)$").matcher(line);
- if (!m.matches() || m.groupCount() != 5) {
- Main.error(tr("Unexpected line ''{0}'' in bookmark file ''{1}''",line, bookmarkFile.toString()));
- continue;
- }
- Bookmark b = new Bookmark();
- b.setName(m.group(1));
- double[] values= new double[4];
- for (int i = 0; i < 4; ++i) {
- try {
- values[i] = Double.parseDouble(m.group(i+2));
- } catch (NumberFormatException e) {
- Main.error(tr("Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''",m.group(i+2),line, bookmarkFile.toString()));
- continue;
- }
- }
- b.setArea(new Bounds(values));
- bookmarks.add(b);
- }
- Utils.close(in);
- Collections.sort(bookmarks);
- for (Bookmark b : bookmarks) {
- model.addElement(b);
- }
- save();
- Main.info("Removing obsolete bookmarks file");
- if (!bookmarkFile.delete()) {
- bookmarkFile.deleteOnExit();
- }
- }
- } catch (IOException e) {
- Main.error(e);
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Could not read bookmarks from
''{0}''
Error was: {1}",
- bookmarkFile.toString(),
- e.getMessage()
- ),
- tr("Error"),
- JOptionPane.ERROR_MESSAGE
- );
- }
- }
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 7025)
+++ trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 7026)
@@ -261,18 +261,4 @@
@Override
public Action[] getMenuEntries() {
- if (Main.applet) {
- return new Action[] {
- LayerListDialog.getInstance().createShowHideLayerAction(),
- LayerListDialog.getInstance().createDeleteLayerAction(),
- SeparatorLayerAction.INSTANCE,
- new CustomizeColor(this),
- new CustomizeDrawingAction(this),
- new ConvertToDataLayerAction(this),
- SeparatorLayerAction.INSTANCE,
- new ChooseTrackVisibilityAction(this),
- new RenameLayerAction(getAssociatedFile(), this),
- SeparatorLayerAction.INSTANCE,
- new LayerListPopup.InfoAction(this) };
- }
return new Action[] {
LayerListDialog.getInstance().createShowHideLayerAction(),
Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 7025)
+++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 7026)
@@ -490,16 +490,4 @@
@Override public Action[] getMenuEntries() {
- if (Main.applet)
- return new Action[]{
- LayerListDialog.getInstance().createActivateLayerAction(this),
- LayerListDialog.getInstance().createShowHideLayerAction(),
- LayerListDialog.getInstance().createDeleteLayerAction(),
- SeparatorLayerAction.INSTANCE,
- LayerListDialog.getInstance().createMergeLayerAction(this),
- SeparatorLayerAction.INSTANCE,
- new RenameLayerAction(getAssociatedFile(), this),
- new ConsistencyTestAction(),
- SeparatorLayerAction.INSTANCE,
- new LayerListPopup.InfoAction(this)};
List actions = new ArrayList<>();
actions.addAll(Arrays.asList(new Action[]{
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 7025)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 7026)
@@ -300,6 +300,4 @@
*/
public void savePreferences() {
- if(Main.applet)
- return;
// create a task for downloading plugins if the user has activated, yet not downloaded,
// new plugins
@@ -507,7 +505,5 @@
settingsFactory.add(new TaggingPresetPreference.Factory());
settingsFactory.add(new BackupPreference.Factory());
- if(!Main.applet) {
- settingsFactory.add(new PluginPreference.Factory());
- }
+ settingsFactory.add(new PluginPreference.Factory());
settingsFactory.add(Main.toolbar);
settingsFactory.add(new AudioPreference.Factory());
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 7025)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 7026)
@@ -5,5 +5,4 @@
import static org.openstreetmap.josm.tools.I18n.tr;
-import java.applet.Applet;
import java.awt.Component;
import java.awt.Container;
@@ -634,6 +633,5 @@
// focus remains on one of the associated components
return;
- else if ((c instanceof Window) ||
- (c instanceof Applet && c.getParent() == null)) {
+ else if (c instanceof Window) {
if (c == SwingUtilities.getRoot(TagTable.this)) {
if (!getCellEditor().stopCellEditing()) {
Index: trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java (revision 7025)
+++ trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java (revision 7026)
@@ -145,17 +145,13 @@
*/
private void loadFromDisk() throws T {
- if (Main.applet)
+ BufferedInputStream input = null;
+ try {
+ input = new BufferedInputStream(new FileInputStream(path));
+ this.data = new byte[input.available()];
+ input.read(this.data);
+ } catch (IOException e) {
this.data = updateForce();
- else {
- BufferedInputStream input = null;
- try {
- input = new BufferedInputStream(new FileInputStream(path));
- this.data = new byte[input.available()];
- input.read(this.data);
- } catch (IOException e) {
- this.data = updateForce();
- } finally {
- Utils.close(input);
- }
+ } finally {
+ Utils.close(input);
}
}
@@ -165,6 +161,4 @@
*/
private void saveToDisk() {
- if (Main.applet)
- return;
BufferedOutputStream output = null;
try {
Index: trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java (revision 7025)
+++ trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java (revision 7026)
@@ -137,10 +137,5 @@
}
} else {
- if (Main.applet) {
- fs = new BufferedInputStream(Utils.openURL(url));
- file = new File(url.getFile());
- } else {
- file = checkLocal(url, destDir, maxTime, httpAccept);
- }
+ file = checkLocal(url, destDir, maxTime, httpAccept);
}
} catch (java.net.MalformedURLException e) {
Index: trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java (revision 7025)
+++ trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java (revision 7026)
@@ -8,6 +8,4 @@
import java.net.MalformedURLException;
import java.net.URI;
-
-import javax.swing.JApplet;
import org.openstreetmap.josm.Main;
@@ -42,14 +40,5 @@
public static String displayUrl(URI uri) {
CheckParameterUtil.ensureParameterNotNull(uri, "uri");
- if (Main.applet) {
- try {
- JApplet applet = (JApplet) Main.parent;
- applet.getAppletContext().showDocument(uri.toURL());
- return null;
- } catch (MalformedURLException mue) {
- return mue.getMessage();
- }
- }
-
+
Main.info(tr("Opening URL: {0}", uri));