From 5a48a61771eb6317ccd4a0842af653fee4c42a62 Mon Sep 17 00:00:00 2001 From: Paul Woelfel Date: Mon, 4 Aug 2014 17:59:54 +0200 Subject: [PATCH] removed unused classes --- .../areaselector/preferences/ServerParam.java | 143 ---------------- .../preferences/ServerParamDialog.java | 147 ---------------- .../preferences/ServerParamList.java | 113 ------------ .../preferences/ServerParamPanel.java | 161 ------------------ .../preferences/ServerParamPreference.java | 44 ----- .../preferences/ServerParamSelectDialog.java | 87 ---------- 6 files changed, 695 deletions(-) delete mode 100644 src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParam.java delete mode 100644 src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamDialog.java delete mode 100644 src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamList.java delete mode 100644 src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamPanel.java delete mode 100644 src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamPreference.java delete mode 100644 src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamSelectDialog.java diff --git a/src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParam.java b/src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParam.java deleted file mode 100644 index cbc9d65..0000000 --- a/src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParam.java +++ /dev/null @@ -1,143 +0,0 @@ -/** - * This file has been taken and slightly modified from the Tracer2 JOSM plugin. - */ - -package org.openstreetmap.josm.plugins.areaselector.preferences; - -import static org.openstreetmap.josm.tools.I18n.tr; - -import java.awt.GridBagLayout; - -import javax.swing.JMenuItem; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import javax.swing.SwingUtilities; - -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.gui.widgets.JMultilineLabel; -import org.openstreetmap.josm.tools.GBC; - -public class ServerParam { - - protected boolean m_bEnabled; - private String m_strName = "Name"; - private String m_strDescription = ""; - private String m_strUrl = ""; - private String m_strColorThreshold = "15"; - private String m_strToleranceDist = "3"; - private String m_strToleranceAngle = Double.toString(Math.PI/8); - - protected JMenuItem m_oMenuItem; - - public boolean isEnabled() { - return m_bEnabled; - } - public void setEnabled(boolean enabled) { - if (!m_bEnabled ^ enabled) - return; - m_bEnabled = enabled; - } - - public String getName() { - return m_strName; - } - public void setName(String name) { - m_strName = name; - } - - public String getDescription() { - return m_strDescription; - } - public void setDescription(String description) { - m_strDescription = description; - } - - public String getUrl() { - return m_strUrl; - } - public void setUrl(String url) { - m_strUrl = url; - } - - public String getColorThreshold() { - return m_strColorThreshold; - } - public void setColorThreshold(String colorThreshold) { - this.m_strColorThreshold = colorThreshold; - } - public String getToleranceDist() { - return m_strToleranceDist; - } - public void setToleranceDist(String toleranceDist) { - this.m_strToleranceDist = toleranceDist; - } - public String getToleranceAngle() { - return m_strToleranceAngle; - } - public void setToleranceAngle(String toleranceAngle) { - this.m_strToleranceAngle = toleranceAngle; - } - public ServerParam() { - m_bEnabled = false; - } - - public ServerParam(String name) { - this(); - m_strName = name; - } - - public String serialize() { - StringBuilder oBuilder = new StringBuilder(); - oBuilder.append("name=").append(m_strName).append('\n'); - oBuilder.append("description=").append(m_strDescription).append('\n'); - oBuilder.append("url=").append(m_strUrl).append('\n'); - oBuilder.append("colorThreshold=").append(m_strColorThreshold).append('\n'); - oBuilder.append("toleranceDist=").append(m_strToleranceDist).append('\n'); - oBuilder.append("toleranceAngle=").append(m_strToleranceAngle).append('\n'); - oBuilder.append("enabled=").append(m_bEnabled).append('\n'); - oBuilder.append('\n'); - return oBuilder.toString(); - } - - public static ServerParam unserialize(String str) { - ServerParam oParam = new ServerParam(); - String[] lines = str.split("\n"); - for (String line : lines) { - String[] parts = line.split("=", 2); - if (parts[0].equals("name")) - oParam.m_strName = parts[1]; - else if (parts[0].equals("description")) - oParam.m_strDescription = parts[1]; - else if (parts[0].equals("url")) - oParam.m_strUrl = parts[1]; - else if (parts[0].equals("colorThreshold")) - oParam.m_strColorThreshold = parts[1]; - else if (parts[0].equals("toleranceDist")) - oParam.m_strToleranceDist = parts[1]; - else if (parts[0].equals("toleranceAngle")) - oParam.m_strToleranceAngle = parts[1]; - else if (parts[0].equals("enabled")) - oParam.m_bEnabled = parts[1].equalsIgnoreCase("true"); - } - return oParam; - } - - protected void showErrorMessage(String message, String details) { - final JPanel p = new JPanel(new GridBagLayout()); - p.add(new JMultilineLabel(message),GBC.eol()); - if (details != null) { - JTextArea info = new JTextArea(details, 20, 60); - info.setCaretPosition(0); - info.setEditable(false); - p.add(new JScrollPane(info), GBC.eop()); - } - SwingUtilities.invokeLater(new Runnable() { - public void run() { - JOptionPane.showMessageDialog(Main.parent, p, tr("Area Selector error"), JOptionPane.ERROR_MESSAGE); - } - }); - } - -} diff --git a/src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamDialog.java b/src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamDialog.java deleted file mode 100644 index dd1bac8..0000000 --- a/src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamDialog.java +++ /dev/null @@ -1,147 +0,0 @@ -/** - * This file has been taken and slightly modified from the Tracer2 JOSM plugin. - */ - -package org.openstreetmap.josm.plugins.areaselector.preferences; - -import static org.openstreetmap.josm.tools.I18n.tr; - -import java.awt.Component; -import java.awt.Dimension; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; -import java.awt.event.ActionEvent; - -import javax.swing.JComboBox; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import javax.swing.JTextField; - -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.gui.ExtendedDialog; -import org.openstreetmap.josm.tools.GBC; - -public class ServerParamDialog extends ExtendedDialog { - /** - * - */ - protected static final long serialVersionUID = -3229680217088662218L; - - protected String[] m_astrColorThreshold = new String[] {"5", "10", "15", "20", "25"}; - protected String[] m_astrToleranceDist = new String[] {"1", "2", "3", "4", "5"}; - protected String[] m_astrToleranceAngle = new String[] {"0.1", "0.2", "0.3", "0.4", "0.5"}; - - protected ServerParam m_oParam; - - protected JPanel m_oPanel = new JPanel(new GridBagLayout()); - protected JTextField m_oName = new JTextField(); - protected JTextField m_oDescription = new JTextField(); - protected JTextArea m_oUrl = new JTextArea(5,5); - protected JTextField m_oColorThreshold; - protected JTextField m_oToleranceDist; - protected JTextField m_oToleranceAngle; - - - protected JScrollPane m_oScrollpaneUrl; - - public ServerParam getServerParam() { - return m_oParam; - } - - protected void addLabelled(String str, Component c) { - JLabel label = new JLabel(str); - m_oPanel.add(label, GBC.std()); - label.setLabelFor(c); - m_oPanel.add(c, GBC.eol().fill(GridBagConstraints.HORIZONTAL)); - } - - protected void addGap() { - JPanel p = new JPanel(); - p.setMinimumSize(new Dimension(10,0)); - m_oPanel.add(p, GBC.eol().fill(GridBagConstraints.HORIZONTAL)); - } - - protected void load() { - m_oName.setText(m_oParam.getName()); - m_oDescription.setText(m_oParam.getDescription()); - m_oUrl.setText(m_oParam.getUrl()); - m_oColorThreshold.setText(m_oParam.getColorThreshold()); - m_oToleranceDist.setText( m_oParam.getToleranceDist()); - m_oToleranceAngle.setText(m_oParam.getToleranceAngle()); - } - - protected void save() { - m_oParam.setName(m_oName.getText()); - m_oParam.setDescription(m_oDescription.getText()); - m_oParam.setUrl(m_oUrl.getText()); - m_oParam.setColorThreshold(m_oColorThreshold.getText()); - m_oParam.setToleranceDist(m_oToleranceDist.getText()); - m_oParam.setToleranceAngle(m_oToleranceAngle.getText()); - - } - - protected void loadComboBox( JComboBox c, String strValue, String[] astrValues ) { - int pos = 0; - for ( String str: astrValues ) { - if (strValue.equals(str)) { - c.setSelectedIndex(pos); - return; - } - pos++; - } - } - - protected String saveComboBox( JComboBox c, String[] astrValues ) { - return astrValues[c.getSelectedIndex()]; - } - - public ServerParamDialog(ServerParam param) { - super(Main.parent, tr("Area Selector") + " - " + tr("Parameter for server request"), - new String[] { tr("OK"), tr("Cancel") }, - true); - if (param == null) { - m_oParam = new ServerParam(); - } else { - m_oParam = param; - } - - contentInsets = new Insets(15, 15, 5, 15); - setButtonIcons(new String[] { "ok.png", "cancel.png" }); - - m_oColorThreshold = new JTextField(); - m_oToleranceDist = new JTextField(); - m_oToleranceAngle = new JTextField(); - - load(); - - addLabelled(tr("Name:"), m_oName); - addLabelled(tr("Description:"), m_oDescription); - addGap(); - m_oUrl.setLineWrap(true); - m_oScrollpaneUrl = new JScrollPane(m_oUrl); - addLabelled(tr("URL:"), m_oScrollpaneUrl); - addGap(); - addLabelled(tr("Color Threshold:"), m_oColorThreshold); - addLabelled(tr("Tolerance Distance:"), m_oToleranceDist); - addLabelled(tr("Tolerance Angle:"), m_oToleranceAngle); - - - setMinimumSize(new Dimension(500, 0)); - - setContent(m_oPanel); - setupDialog(); - } - - @Override - protected void buttonAction(int buttonIndex, ActionEvent evt) { - if (evt.getActionCommand().equals(tr("OK"))) { - save(); - } else { - m_oParam = null; - } - super.buttonAction(buttonIndex, evt); - } -} diff --git a/src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamList.java b/src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamList.java deleted file mode 100644 index caaed50..0000000 --- a/src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamList.java +++ /dev/null @@ -1,113 +0,0 @@ -/** - * This file has been taken and slightly modified from the Tracer2 JOSM plugin. - */ - -package org.openstreetmap.josm.plugins.areaselector.preferences; - -import java.io.BufferedReader; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.util.ArrayList; -import java.util.List; - -public class ServerParamList { - ArrayList m_listServerParam = new ArrayList(); - ServerParam m_oActivParam = null; - String m_strFilename; - - public ServerParamList(String filename) { - this.m_strFilename = filename; - if (filename == null) { - loadDefault(); - } else { - load(); - } - } - - public void load() { - try { - BufferedReader oReader = new BufferedReader(new InputStreamReader(new FileInputStream(m_strFilename), "UTF-8")); - StringBuilder oBuilder = new StringBuilder(); - String strLine; - while ((strLine = oReader.readLine()) != null) { - oBuilder.append(strLine).append('\n'); - if (strLine.equals("")) { - m_listServerParam.add(ServerParam.unserialize(oBuilder.toString())); - oBuilder = new StringBuilder(); - } - } - oReader.close(); - } catch (Exception e) { - loadDefault(); - } - } - - public void loadDefault() { - try { - InputStream oIP = getClass().getResourceAsStream("/resources/serverParam.cfg"); - BufferedReader oReader = new BufferedReader(new InputStreamReader(oIP)); - StringBuilder oBuilder = new StringBuilder(); - String strLine; - while ((strLine = oReader.readLine()) != null) { - oBuilder.append(strLine).append('\n'); - if (strLine.equals("")) { - m_listServerParam.add(ServerParam.unserialize(oBuilder.toString())); - oBuilder = new StringBuilder(); - } - } - oReader.close(); - } catch (Exception e) { - System.err.println("Area Selector warning: can't load file " + m_strFilename); - //e.printStackTrace(); - } - } - - public void save() { - try { - OutputStreamWriter oWriter = new OutputStreamWriter(new FileOutputStream(m_strFilename), "UTF-8"); - for (ServerParam param : m_listServerParam) { - oWriter.write(param.serialize()); - } - oWriter.close(); - } catch (Exception e) { - System.err.println("Area Selector warning: can't save file " + m_strFilename); - //e.printStackTrace(); - } - } - - public List getParamList() { - return m_listServerParam; - } - - public ServerParam getActivParam() { - return m_oActivParam; - } - public void setActivParam(ServerParam param) { - if ( m_listServerParam.contains(param)) { - m_oActivParam = param; - } - } - - public List getEnableParamList() { - List listParam = new ArrayList(); - for ( ServerParam param: m_listServerParam) { - if (param.isEnabled()) { - listParam.add(param); - } - } - return listParam; - } - - public void addParam(ServerParam param) { - m_listServerParam.add(param); - } - - public void removeParam(ServerParam param) { - param.setEnabled(false); - m_listServerParam.remove(param); - } - -} diff --git a/src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamPanel.java b/src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamPanel.java deleted file mode 100644 index eee28d1..0000000 --- a/src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamPanel.java +++ /dev/null @@ -1,161 +0,0 @@ -/** - * This file has been taken and slightly modified from the Tracer2 JOSM plugin. - */ - -package org.openstreetmap.josm.plugins.areaselector.preferences; - -import static org.openstreetmap.josm.tools.I18n.tr; - -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JDialog; -import javax.swing.JOptionPane; -import javax.swing.JPanel; - -import org.openstreetmap.josm.Main; - -public class ServerParamPanel extends JPanel { - /** - * - */ - private static final long serialVersionUID = -6174275926314685531L; - - ServerParamList m_listParam; - - public ServerParamPanel(ServerParamList listParam) { - super(new GridBagLayout()); - m_listParam = listParam; - } - - public void refresh() { - removeAll(); - GridBagConstraints gbc = new GridBagConstraints(); - gbc.gridy = 0; - gbc.fill = GridBagConstraints.HORIZONTAL; - gbc.insets = new Insets(2, 5, 2, 5); - - for (final ServerParam param : m_listParam.getParamList()) { - gbc.gridx = 0; - gbc.weightx = 1.0; - gbc.anchor = GridBagConstraints.WEST; - - final JCheckBox cbParam = new JCheckBox(param.getName()); - cbParam.setSelected(param.isEnabled()); - cbParam.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - param.setEnabled(cbParam.isSelected()); - } - }); - add(cbParam, gbc); - - gbc.gridx = 1; - gbc.weightx = 0; - gbc.anchor = GridBagConstraints.EAST; - - final JButton bEdit = new JButton(tr("Edit")); - bEdit.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent arg0) { - JDialog dlg = new ServerParamDialog(param); - dlg.setVisible(true); - dlg.dispose(); - refresh(); - } - }); - add(bEdit, gbc); - - gbc.gridx = 2; - final JButton bDel = new JButton(tr("Delete")); - bDel.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent arg0) { - if (JOptionPane.showConfirmDialog(Main.parent, - tr("Delete parameter \"{0}\"?", param.getName()), - tr("Are you sure?"), - JOptionPane.YES_NO_OPTION, - JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) - { - m_listParam.removeParam(param); - refresh(); - } - } - }); - add(bDel, gbc); - - gbc.gridy++; - } - gbc.gridx = 0; - gbc.fill = GridBagConstraints.NONE; - gbc.anchor = GridBagConstraints.WEST; - - JPanel p = new JPanel(new GridBagLayout()); - - final JButton bNew = new JButton(tr("Add new")); - bNew.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent arg0) { - JDialog dlg = new ServerParamDialog(null); - dlg.setVisible(true); - dlg.dispose(); - ServerParam param = ((ServerParamDialog)dlg).getServerParam(); - if (param != null && param.getName() != null && (!"".equals(param.getName()))) { - m_listParam.addParam(param); - param.setEnabled(true); - } - refresh(); - } - }); - p.add(bNew); - - final JButton bPredefined = new JButton(tr("Add predefined")); - bPredefined.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent arg0) { - ServerParamList myParamList; - - myParamList = new ServerParamList(null); - - ServerParamSelectDialog dialog = new ServerParamSelectDialog(myParamList.getParamList(), null); - - if (dialog.getShow()) { - JOptionPane pane = new JOptionPane(dialog, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION); - JDialog dlg = pane.createDialog(Main.parent, tr("Area Selector") + " - " + tr("Select predefined parameter")); - dlg.setVisible(true); - Object obj = pane.getValue(); - dlg.dispose(); - if(obj != null && ((Integer)obj) == JOptionPane.OK_OPTION) { - ServerParam param = dialog.getSelectedParam(); - - dlg = new ServerParamDialog(param); - dlg.setVisible(true); - dlg.dispose(); - param = ((ServerParamDialog)dlg).getServerParam(); - if (param != null && param.getName() != null && (!"".equals(param.getName()))) { - m_listParam.addParam(param); - param.setEnabled(true); - } - } - } - refresh(); - } - }); - p.add(bPredefined); - - add(p, gbc); - gbc.gridy++; - - gbc.weightx = 1.0; - gbc.weighty = 1.0; - gbc.fill = GridBagConstraints.BOTH; - add(new JPanel(), gbc); - revalidate(); - repaint(); - } - -} diff --git a/src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamPreference.java b/src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamPreference.java deleted file mode 100644 index f9c4b96..0000000 --- a/src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamPreference.java +++ /dev/null @@ -1,44 +0,0 @@ -/** - * This file has been taken and slightly modified from the Tracer2 JOSM plugin. - */ - -package org.openstreetmap.josm.plugins.areaselector.preferences; - -import static org.openstreetmap.josm.tools.I18n.tr; - -import java.awt.GridBagConstraints; - -import javax.swing.JPanel; -import javax.swing.JScrollPane; - -import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting; -import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane; -import org.openstreetmap.josm.plugins.areaselector.AreaSelectorPlugin; -import org.openstreetmap.josm.tools.GBC; - -public class ServerParamPreference extends DefaultTabPreferenceSetting { - - AreaSelectorPlugin m_oPlugin; - - public ServerParamPreference(AreaSelectorPlugin plugin) { - super("areaselector", tr("Area Selector") + " - " + tr("Preferences"), tr("Select tile map service or imagery preferences.")); - - m_oPlugin = plugin; - } - - @Override - public void addGui(PreferenceTabbedPane gui) { - JPanel p = gui.createPreferenceTab(this); - ServerParamPanel spp = new ServerParamPanel(null); - spp.refresh(); - JScrollPane sp = new JScrollPane(spp); - p.add(sp, GBC.eol().fill(GridBagConstraints.BOTH)); - } - - @Override - public boolean ok() { -// m_oPlugin.m_oParamList.save(); - return false; - } - -} diff --git a/src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamSelectDialog.java b/src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamSelectDialog.java deleted file mode 100644 index f661d19..0000000 --- a/src/org/openstreetmap/josm/plugins/areaselector/preferences/ServerParamSelectDialog.java +++ /dev/null @@ -1,87 +0,0 @@ -/** - * This file has been taken and slightly modified from the Tracer2 JOSM plugin. - */ - -package org.openstreetmap.josm.plugins.areaselector.preferences; - -import static org.openstreetmap.josm.tools.I18n.tr; - -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; -import java.util.List; - -import javax.swing.JComboBox; -import javax.swing.JLabel; -import javax.swing.JPanel; - -import org.openstreetmap.josm.plugins.areaselector.AreaSelectorPlugin; - -@SuppressWarnings("serial") -public class ServerParamSelectDialog extends JPanel { - - private JComboBox m_oComboBox; - List m_listServerParam; - private boolean m_bShow = true; - - public boolean getShow() { - return m_bShow; - } - - public ServerParamSelectDialog(List listParam) { - Init(m_listServerParam, null); - } - - public ServerParamSelectDialog(List listServerParam, ServerParam activParam) { - Init(listServerParam, activParam); - } - - private void Init(List listParam, ServerParam activParam) { - GridBagConstraints c = new GridBagConstraints(); - - String[] astr = new String[listParam.size()]; - - m_listServerParam = listParam; - - if ( activParam == null ) { - activParam = m_listServerParam.get(0); - } - int i = 0; - int pos = 0; - for ( ServerParam param: m_listServerParam ) { - astr[i] = param.getName(); - if (param.equals(activParam)) { - pos = i; - } - i++; - } - m_oComboBox = new JComboBox<>(astr); - m_oComboBox.setSelectedIndex(pos); - - setLayout(new GridBagLayout()); - - c.insets = new Insets(4,4,4,4); - c.gridwidth = 1; - c.weightx = 0.8; - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 0; - c.gridy = 0; - add(new JLabel(tr("Parameter:")), c); - - c.gridwidth = 1; - c.gridx = 1; - c.gridy = 0; - c.weightx = 1.5; - add(m_oComboBox, c); - } - - public ServerParam getSelectedParam() { - int nSel = m_oComboBox.getSelectedIndex(); - return m_listServerParam.get(nSel); - } - public void checkComboBox() { - int nSel = m_oComboBox.getSelectedIndex(); -// AreaSelectorPlugin.s_oPlugin.m_oParamList.setActivParam(m_listServerParam.get(nSel)); - } - -}