Ignore:
Timestamp:
2013-08-21T03:47:16+02:00 (11 years ago)
Author:
donvip
Message:

[josm_plugins] fix #8987 - bump min JOSM version of nearly all plugins to r6162 + code update/cleanup, fix warnings

Location:
applications/editors/josm/plugins/tageditor
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/tageditor/.settings/org.eclipse.jdt.core.prefs

    r14520 r29854  
    1 #Sun Mar 29 18:09:38 CEST 2009
    21eclipse.preferences.version=1
    32org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,*.groovy
     3org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
     4org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
     5org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
     6org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
     7org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
     8org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
     9org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
     10org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
     11org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
     12org.eclipse.jdt.core.compiler.problem.deadCode=warning
     13org.eclipse.jdt.core.compiler.problem.deprecation=warning
     14org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
     15org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
     16org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
     17org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
     18org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
     19org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
     20org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
     21org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
     22org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
     23org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
     24org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
     25org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
     26org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
     27org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
     28org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
     29org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
     30org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
     31org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
     32org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
     33org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
     34org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
     35org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
     36org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
     37org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
     38org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
     39org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
     40org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
     41org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
     42org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
     43org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
     44org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
     45org.eclipse.jdt.core.compiler.problem.nullReference=warning
     46org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
     47org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
     48org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
     49org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
     50org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
     51org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
     52org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
     53org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
     54org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
     55org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
     56org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
     57org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
     58org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
     59org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
     60org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
     61org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
     62org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
     63org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
     64org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
     65org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
     66org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
     67org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
     68org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
     69org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
     70org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
     71org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
     72org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
     73org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
     74org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
     75org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
     76org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
     77org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
     78org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
     79org.eclipse.jdt.core.compiler.problem.unusedImport=warning
     80org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
     81org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
     82org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
     83org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
     84org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
     85org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
     86org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
     87org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
     88org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
     89org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
     90org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

  • applications/editors/josm/plugins/tageditor/build.xml

    r29435 r29854  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <!--
    3 ** This is the build file for the tageditor plugin
    4 **
    5 ** Maintaining versions
    6 ** ====================
    7 ** see README.template
    8 **
    9 ** Usage
    10 ** =====
    11 ** To build it run
    12 **
    13 **    > ant  dist
    14 **
    15 ** To install the generated plugin locally (in your default plugin directory) run
    16 **
    17 **    > ant  install
    18 **
    19 ** To build against the core in ../../core, create a correct manifest and deploy to
    20 ** SVN,
    21 **    set the properties commit.message and plugin.main.version
    22 ** and run
    23 **    > ant  publish
    24 **
    25 **
    26 -->
    272<project name="tageditor" default="dist" basedir=".">
    283    <property name="commit.message" value="Tageditor:  help shortcut parser, rebuild"/>
    29     <property name="plugin.main.version" value="4980"/>
     4    <property name="plugin.main.version" value="6162"/>
    305    <!--
    316      ************************************************
    … …  
    3712    <!-- this is the directory where the plugin jar is copied to -->
    3813    <property name="plugin.dist.dir" value="../../dist"/>
    39     <property name="ant.build.javac.target" value="1.5"/>
     14    <property name="ant.build.javac.target" value="1.6"/>
    4015    <property name="plugin.dist.dir" value="../../dist"/>
    4116    <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java

    r29853 r29854  
    1414import java.beans.PropertyChangeEvent;
    1515import java.beans.PropertyChangeListener;
    16 import java.util.logging.Logger;
    1716
    1817import javax.swing.AbstractAction;
    … …  
    3130import org.openstreetmap.josm.data.osm.DataSet;
    3231import org.openstreetmap.josm.data.osm.OsmPrimitive;
     32import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
    3333import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
    34 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
    3534import org.openstreetmap.josm.plugins.tageditor.ac.AutoCompletionListViewer;
    3635import org.openstreetmap.josm.plugins.tageditor.editor.TagEditor;
    … …  
    5049@SuppressWarnings("serial")
    5150public class TagEditorDialog extends JDialog {
    52     static private final Logger logger = Logger.getLogger(TagEditorDialog.class.getName());
     51    //static private final Logger logger = Logger.getLogger(TagEditorDialog.class.getName());
    5352
    5453    /** the unique instance */

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListViewer.java

    r23189 r29854  
    88import java.awt.event.MouseEvent;
    99import java.util.ArrayList;
    10 import java.util.logging.Logger;
    1110
    1211import javax.swing.AbstractAction;
    … …  
    1918import javax.swing.ListSelectionModel;
    2019import javax.swing.table.DefaultTableModel;
     20
    2121import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
    2222
    2323public class AutoCompletionListViewer extends JPanel {
    2424   
    25     static private Logger logger = Logger.getLogger(AutoCompletionListViewer.class.getName());
     25    //static private Logger logger = Logger.getLogger(AutoCompletionListViewer.class.getName());
    2626
    2727    /** the table showing the auto completion list entries */

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java

    r23189 r29854  
    44
    55import java.awt.Component;
    6 import java.util.logging.Logger;
    76
    87import javax.swing.JLabel;
    … …  
    1413
    1514public class PresetItemListCellRenderer extends JLabel implements ListCellRenderer {
    16     private static final Logger logger = Logger.getLogger(PresetItemListCellRenderer.class.getName());
     15    //private static final Logger logger = Logger.getLogger(PresetItemListCellRenderer.class.getName());
    1716
    1817    public Component getListCellRendererComponent(JList list, Object value,

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java

    r23189 r29854  
    99import java.awt.event.ItemEvent;
    1010import java.awt.event.ItemListener;
    11 import java.util.logging.Logger;
    1211
    1312import javax.swing.JButton;
    … …  
    1918public class PresetManager extends JPanel {
    2019
    21     static private final Logger logger = Logger.getLogger(PresetManager.class.getName());
     20    //static private final Logger logger = Logger.getLogger(PresetManager.class.getName());
    2221
    2322    private JComboBox presets;

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java

    r23189 r29854  
    77import java.awt.Component;
    88import java.awt.Font;
    9 import java.util.logging.Logger;
    109
    1110import javax.swing.JLabel;
    … …  
    2726public class TableCellRenderer extends JLabel implements javax.swing.table.TableCellRenderer  {
    2827   
    29     private static Logger logger = Logger.getLogger(TableCellRenderer.class.getName());
     28    //private static Logger logger = Logger.getLogger(TableCellRenderer.class.getName());
    3029    public static final Color BG_COLOR_HIGHLIGHTED = new Color(255,255,204);
    3130       

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java

    r23189 r29854  
    22package org.openstreetmap.josm.plugins.tageditor.editor;
    33
     4import static org.openstreetmap.josm.tools.I18n.trn;
     5
    46import java.util.ArrayList;
    5 
    67import java.util.Collection;
    7 import java.util.logging.Logger;
    88
    99import javax.swing.DefaultComboBoxModel;
    … …  
    1818import org.openstreetmap.josm.plugins.tageditor.preset.Tag;
    1919import org.openstreetmap.josm.plugins.tageditor.tagspec.KeyValuePair;
    20 import static org.openstreetmap.josm.tools.I18n.trn;
    2120
    2221/**
    … …  
    2524@SuppressWarnings("serial")
    2625public class TagEditorModel extends org.openstreetmap.josm.gui.tagging.TagEditorModel  {
    27     static private final Logger logger = Logger.getLogger(TagEditorModel.class.getName());
     26    //static private final Logger logger = Logger.getLogger(TagEditorModel.class.getName());
    2827   
    2928    private DefaultComboBoxModel appliedPresets = null;

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/AbstractNameIconProvider.java

    r27675 r29854  
    11package org.openstreetmap.josm.plugins.tageditor.preset;
    22
    3 import java.awt.Image;
    43import java.io.File;
    54import java.util.Collection;

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Group.java

    r23189 r29854  
    33import java.util.ArrayList;
    44import java.util.List;
    5 import java.util.logging.Logger;
    65
    76/**
    … …  
    1110public class Group extends AbstractNameIconProvider {
    1211   
    13     static final private Logger logger = Logger.getLogger(Group.class.getName());
     12    //static final private Logger logger = Logger.getLogger(Group.class.getName());
    1413   
    1514    private List<Item> items = null;

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Item.java

    r23189 r29854  
    33import java.util.ArrayList;
    44import java.util.List;
    5 import java.util.logging.Logger;
    65
    76public class Item  extends AbstractNameIconProvider {
    87
    9     private final static Logger logger = Logger.getLogger(Item.class.getName());
     8    //private final static Logger logger = Logger.getLogger(Item.class.getName());
    109
    1110    private String label;

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/NameIconCellRenderer.java

    r23189 r29854  
    44import java.awt.Component;
    55import java.awt.Font;
    6 import java.util.logging.Logger;
    76
    87import javax.swing.JLabel;
    … …  
    1615public class NameIconCellRenderer extends JLabel implements TableCellRenderer {
    1716
    18     private static Logger logger = Logger.getLogger(NameIconCellRenderer.class.getName());
     17    //private static Logger logger = Logger.getLogger(NameIconCellRenderer.class.getName());
    1918    public static final Color BG_COLOR_SELECTED = new Color(143,170,255);
    2019

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableModel.java

    r23189 r29854  
    22
    33import java.util.ArrayList;
    4 import java.util.logging.Logger;
    54
    65import javax.swing.event.TableModelListener;
    … …  
    1413public class PresetsTableModel extends AbstractTableModel  {
    1514
    16     private static final Logger logger = Logger.getLogger(PresetsTableModel.class.getName());
     15    //private static final Logger logger = Logger.getLogger(PresetsTableModel.class.getName());
    1716
    1817    private final ArrayList<TableModelListener> listeners = new ArrayList<TableModelListener>();

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/KeyValueCellRenderer.java

    r23189 r29854  
    33import java.awt.Component;
    44import java.awt.Font;
    5 import java.util.logging.Logger;
    65
    76import javax.swing.JLabel;
    … …  
    1211public class KeyValueCellRenderer extends JLabel implements TableCellRenderer  {
    1312
    14     private static final Logger logger = Logger.getLogger(KeyValueCellRenderer.class.getName());
     13    //private static final Logger logger = Logger.getLogger(KeyValueCellRenderer.class.getName());
    1514
    1615    protected void init() {
Note: See TracChangeset for help on using the changeset viewer.