Ticket #19334: 19334.diff

File 19334.diff, 131.7 KB (added by Don-vip, 5 years ago)

  • README

     
    194194* Metadata Extractor: Read EXIF Metadata of photos
    195195    -> https://github.com/drewnoakes/metadata-extractor
    196196* Signpost: OAuth library
    197     src/oauth, src/com/google
     197    src/com/google
    198198    -> https://github.com/mttkay/signpost
    199199* MultiSplitPane: Small lib for GUI layout management
    200200    src/org/openstreetmap/josm/gui/MultiSplitLayout.java, MultiSplitPane.java

  • build.xml

     
    6363        <property name="script-build.dir" location="${base.dir}/build2"/>
    6464        <property name="checkstyle-build.dir" location="${base.dir}/build2"/>
    6565        <property name="epsg.output" location="${resources.dir}/data/projection/custom-epsg"/>
    66         <property name="error_prone_core.jar" location="${tools.dir}/error_prone_core.jar"/>
    67         <property name="error_prone_javac.jar" location="${tools.dir}/error_prone_javac.jar"/>
    68         <property name="auto-value-annotations.jar" location="${tools.dir}/auto-value-annotations.jar"/>
    69         <property name="dataflow.jar" location="${tools.dir}/dataflow-shaded.jar"/>
    70         <property name="javacutil.jar" location="${tools.dir}/javacutil.jar"/>
    71         <property name="failureaccess.jar" location="${tools.dir}/failureaccess.jar"/>
     66        <property name="error_prone_javac.jar" location="${tools.dir}/error_prone/javac.jar"/>
    7267        <property name="commons-lang3.jar" location="${tools.dir}/commons-lang3.jar"/>
    73         <property name="jformatstring.jar" location="${spotbugs.dir}/jFormatString-3.0.0.jar"/>
    7468        <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
    7569        <property name="dist-optimized.jar" location="${dist.dir}/josm-custom-optimized.jar"/>
    7670        <property name="dist-sources.jar" location="${dist.dir}/josm-custom-sources.jar"/>
    … …  
    10498        <condition property="java.library.dir" value="jmods" else="lib">
    10599            <isset property="isJava9"/>
    106100        </condition>
    107         <path id="processor.path">
    108             <pathelement location="${error_prone_core.jar}"/>
    109             <pathelement location="${dataflow.jar}"/>
    110             <pathelement location="${javacutil.jar}"/>
    111             <pathelement location="${failureaccess.jar}"/>
    112             <pathelement location="${jformatstring.jar}"/>
    113             <pathelement location="${auto-value-annotations.jar}"/>
    114         </path>
    115101    </target>
    116102
    117103    <!--
    … …  
    283269    </target>
    284270    <target name="compile-cots" depends="init" description="Compiles third-party dependencies not retrieved with Ivy">
    285271        <!-- COTS -->
    286         <javac srcdir="${src.dir}" includes="com/google/**,com/kitfox/**,oauth/**" excludes="**/package-info.java" nowarn="on" encoding="iso-8859-1"
     272        <javac srcdir="${src.dir}" includes="com/google/**,com/kitfox/**" excludes="**/package-info.java" nowarn="on" encoding="iso-8859-1"
    287273            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false">
    288274            <!-- get rid of "internal proprietary API" warning -->
    289275            <compilerarg value="-XDignore.symbol.file"/>
    … …  
    293279        </javac>
    294280    </target>
    295281    <target name="compile" depends="init,javacc,compile-cots" unless="compile.notRequired" description="Compiles JOSM">
     282        <ivy:cachepath log="download-only" file="${tools.ivy}" pathid="errorprone.classpath" conf="errorprone"/>
     283        <ivy:retrieve log="download-only" file="${tools.ivy}" pattern="${tools.dir}/error_prone/[artifact].[ext]" conf="errorprone"/>
    296284        <!-- JOSM -->
    297285        <javac sourcepath="" srcdir="${src.dir}" fork="yes"
    298             excludes="com/**,oauth/**,org/apache/commons/**,**/package-info.java"
     286            excludes="com/**,org/apache/commons/**,**/package-info.java"
    299287            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" encoding="UTF-8">
    300288            <compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/>
    301289            <compilerarg line="-XDcompilePolicy=simple"/>
    302290            <compilerarg value="-processorpath"/>
    303             <compilerarg pathref="processor.path"/>
     291            <compilerarg pathref="errorprone.classpath"/>
    304292            <compilerarg value="-Xlint:cast"/>
    305293            <compilerarg value="-Xlint:deprecation"/>
    306294            <compilerarg value="-Xlint:dep-ann"/>
    … …  
    314302            <compilerarg value="-Xlint:unchecked"/>
    315303            <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
    316304            <compilerarg value="-XDignore.symbol.file"/>
    317             <compilerarg value="-Xplugin:ErrorProne -XepExcludedPaths:.*/parsergen/.* -Xep:ReferenceEquality:OFF -Xep:ImmutableEnumChecker:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:FloatingPointLiteralPrecision:OFF -Xep:ShortCircuitBoolean:OFF -Xep:StringSplitter:OFF -Xep:JdkObsolete:OFF -Xep:UnnecessaryParentheses:OFF -Xep:EqualsGetClass:OFF -Xep:ThreadPriorityCheck:OFF -Xep:UndefinedEquals:OFF -Xep:MixedMutabilityReturnType:OFF -Xep:OverrideThrowableToString:OFF -Xep:JavaTimeDefaultTimeZone:OFF -Xep:UnusedVariable:OFF -Xep:EqualsUsingHashCode:OFF -Xep:BadImport:OFF -Xep:UnnecessaryLambda:OFF -Xep:AnnotateFormatMethod:OFF -Xep:MutablePublicArray:OFF"/>
     305            <compilerarg value="-Xplugin:ErrorProne -XepExcludedPaths:.*/parsergen/.* -Xep:ReferenceEquality:OFF -Xep:ImmutableEnumChecker:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:FloatingPointLiteralPrecision:OFF -Xep:ShortCircuitBoolean:OFF -Xep:StringSplitter:OFF -Xep:JdkObsolete:OFF -Xep:UnnecessaryParentheses:OFF -Xep:EqualsGetClass:OFF -Xep:ThreadPriorityCheck:OFF -Xep:UndefinedEquals:OFF -Xep:MixedMutabilityReturnType:OFF -Xep:OverrideThrowableToString:OFF -Xep:JavaTimeDefaultTimeZone:OFF -Xep:UnusedVariable:OFF -Xep:EqualsUsingHashCode:OFF -Xep:BadImport:OFF -Xep:UnnecessaryLambda:OFF -Xep:AnnotateFormatMethod:OFF -Xep:MutablePublicArray:OFF -Xep:StaticAssignmentInConstructor:OFF"/>
    318306            <compilerarg line="-Xmaxwarns 1000"/>
    319307            <classpath>
    320308                <path refid="runtime.path"/>
    … …  
    11461134    <target name="bootstrap-workspace" description="Copy libraries from ivy cache to workspace folders for IDE" depends="resolve">
    11471135        <delete dir="${lib.dir}"/>
    11481136        <ivy:retrieve pattern="${lib.dir}/[conf]/[artifact]-[type].[ext]" conf="compile,runtime,sources,test"/>
    1149         <ivy:retrieve pattern="${lib.dir}/tools/[artifact]-[type].[ext]" conf="javacc,checkstyle,pmd,spotbugs" file="${tools.ivy}"/>
     1137        <ivy:retrieve pattern="${lib.dir}/tools/[artifact]-[type].[ext]" conf="javacc,checkstyle,pmd,spotbugs,errorprone" file="${tools.ivy}"/>
    11501138    </target>
    11511139    <target name="ivy-report" description="Generates Ivy reports of dependency resolving" depends="resolve">
    11521140        <ivy:report todir="${tools.dir}/ivy-report" graph="false"/>

  • src/org/openstreetmap/josm/actions/AbstractInfoAction.java

     
    2929     * Constructs a new {@code AbstractInfoAction}.
    3030     * @param installAdapters false, if you don't want to install layer changed and selection changed adapters
    3131     */
    32     public AbstractInfoAction(boolean installAdapters) {
     32    protected AbstractInfoAction(boolean installAdapters) {
    3333        super(installAdapters);
    3434    }
    3535
    … …  
    4747     * @param toolbarId identifier for the toolbar preferences. The iconName is used, if this parameter is null
    4848     * @param installAdapters false, if you don't want to install layer changed and selection changed adapters
    4949     */
    50     public AbstractInfoAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register,
     50    protected AbstractInfoAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register,
    5151            String toolbarId, boolean installAdapters) {
    5252        super(name, iconName, tooltip, shortcut, register, toolbarId, installAdapters);
    5353    }

  • src/org/openstreetmap/josm/actions/AbstractMergeAction.java

     
    9696     *            the user CANNOT configure a shortcut for your action.
    9797     * @param register register this action for the toolbar preferences?
    9898     */
    99     public AbstractMergeAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register) {
     99    protected AbstractMergeAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register) {
    100100        super(name, iconName, tooltip, shortcut, register);
    101101    }
    102102
    … …  
    114114     * @param toolbar identifier for the toolbar preferences. The iconName is used, if this parameter is null
    115115     * @param installAdapters false, if you don't want to install layer changed and selection changed adapters
    116116     */
    117     public AbstractMergeAction(String name, String iconName, String tooltip, Shortcut shortcut,
     117    protected AbstractMergeAction(String name, String iconName, String tooltip, Shortcut shortcut,
    118118    boolean register, String toolbar, boolean installAdapters) {
    119119        super(name, iconName, tooltip, shortcut, register, toolbar, installAdapters);
    120120    }

  • src/org/openstreetmap/josm/actions/AbstractPasteAction.java

     
    3838     *            the user CANNOT configure a shortcut for your action.
    3939     * @param registerInToolbar register this action for the toolbar preferences?
    4040     */
    41     public AbstractPasteAction(String name, String iconName, String tooltip, Shortcut shortcut,
     41    protected AbstractPasteAction(String name, String iconName, String tooltip, Shortcut shortcut,
    4242            boolean registerInToolbar) {
    4343        this(name, iconName, tooltip, shortcut, registerInToolbar, null);
    4444    }
    … …  
    5656     * @param registerInToolbar register this action for the toolbar preferences?
    5757     * @param toolbarId identifier for the toolbar preferences. The iconName is used, if this parameter is null
    5858     */
    59     public AbstractPasteAction(String name, String iconName, String tooltip, Shortcut shortcut,
     59    protected AbstractPasteAction(String name, String iconName, String tooltip, Shortcut shortcut,
    6060            boolean registerInToolbar, String toolbarId) {
    6161        super(name, iconName, tooltip, shortcut, registerInToolbar, toolbarId, true);
    6262        transferHandler = new OsmTransferHandler();

  • src/org/openstreetmap/josm/actions/AbstractSelectAction.java

     
    1616    /**
    1717     * Constructs a new {@code AbstractSelectAction}.
    1818     */
    19     public AbstractSelectAction() {
     19    protected AbstractSelectAction() {
    2020        putValue(NAME, tr("Select"));
    2121        putValue(SHORT_DESCRIPTION, tr("Selects those elements on the map which are chosen on the list above."));
    2222        new ImageProvider("dialogs", "select").getResource().attachImageIcon(this, true);

  • src/org/openstreetmap/josm/actions/AbstractShowHistoryAction.java

     
    1212 * @since 16495
    1313 */
    1414public abstract class AbstractShowHistoryAction extends AbstractAction {
     15
    1516    /**
    1617     * Constructs a new {@code AbstractShowHistoryAction}.
    1718     */
    18     public AbstractShowHistoryAction() {
     19    protected AbstractShowHistoryAction() {
    1920        putValue(NAME, tr("History"));
    2021        putValue(SHORT_DESCRIPTION, tr("Download and show the history of the selected objects"));
    2122        new ImageProvider("dialogs", "history").getResource().attachImageIcon(this, true);

  • src/org/openstreetmap/josm/actions/AbstractUploadAction.java

     
    2828     *            the user CANNOT configure a shortcut for your action.
    2929     * @param registerInToolbar register this action for the toolbar preferences?
    3030     */
    31     public AbstractUploadAction(String name, String iconName, String tooltip, Shortcut shortcut,
     31    protected AbstractUploadAction(String name, String iconName, String tooltip, Shortcut shortcut,
    3232            boolean registerInToolbar) {
    3333        super(name, iconName, tooltip, shortcut, registerInToolbar);
    3434    }

  • src/org/openstreetmap/josm/actions/ActionParameter.java

     
    1616     * Constructs a new ActionParameter.
    1717     * @param name parameter name (the key)
    1818     */
    19     public ActionParameter(String name) {
     19    protected ActionParameter(String name) {
    2020        this.name = name;
    2121    }
    2222

  • src/org/openstreetmap/josm/actions/DiskAccessAction.java

     
    2525     * @param shortcut A ready-created shortcut object or {@code null} if you don't want a shortcut
    2626     * @since 1084
    2727     */
    28     public DiskAccessAction(String name, String iconName, String tooltip, Shortcut shortcut) {
     28    protected DiskAccessAction(String name, String iconName, String tooltip, Shortcut shortcut) {
    2929        super(name, iconName, tooltip, shortcut, true);
    3030    }
    3131
    … …  
    4141     * @param installAdapters False, if you don't want to install layer changed and selection changed adapters
    4242     * @since 5438
    4343     */
    44     public DiskAccessAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register,
     44    protected DiskAccessAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register,
    4545            String toolbarId, boolean installAdapters) {
    4646        super(name, iconName, tooltip, shortcut, register, toolbarId, installAdapters);
    4747    }

  • src/org/openstreetmap/josm/actions/DownloadAlongAction.java

     
    5959     *            the user CANNOT configure a shortcut for your action.
    6060     * @param registerInToolbar register this action for the toolbar preferences?
    6161     */
    62     public DownloadAlongAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar) {
     62    protected DownloadAlongAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar) {
    6363        super(name, iconName, tooltip, shortcut, registerInToolbar);
    6464    }
    6565

  • src/org/openstreetmap/josm/actions/JosmAction.java

     
    7878     * @param toolbarId identifier for the toolbar preferences
    7979     * @param installAdapters false, if you don't want to install layer changed and selection changed adapters
    8080     */
    81     public JosmAction(String name, ImageProvider icon, String tooltip, Shortcut shortcut, boolean registerInToolbar,
     81    protected JosmAction(String name, ImageProvider icon, String tooltip, Shortcut shortcut, boolean registerInToolbar,
    8282            String toolbarId, boolean installAdapters) {
    8383        super(name);
    8484        if (icon != null) {
    … …  
    126126     * @param toolbarId identifier for the toolbar preferences. The iconName is used, if this parameter is null
    127127     * @param installAdapters false, if you don't want to install layer changed and selection changed adapters
    128128     */
    129     public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar,
     129    protected JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar,
    130130            String toolbarId, boolean installAdapters) {
    131131        this(name, iconName == null ? null : new ImageProvider(iconName).setOptional(true), tooltip, shortcut, registerInToolbar,
    132132                toolbarId == null ? iconName : toolbarId, installAdapters);
    … …  
    148148     * @param registerInToolbar register this action for the toolbar preferences?
    149149     * @param installAdapters false, if you don't want to install layer changed and selection changed adapters
    150150     */
    151     public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar, boolean installAdapters) {
     151    protected JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar, boolean installAdapters) {
    152152        this(name, iconName, tooltip, shortcut, registerInToolbar, null, installAdapters);
    153153    }
    154154
    … …  
    167167     *            the user CANNOT configure a shortcut for your action.
    168168     * @param registerInToolbar register this action for the toolbar preferences?
    169169     */
    170     public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar) {
     170    protected JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar) {
    171171        this(name, iconName, tooltip, shortcut, registerInToolbar, null, true);
    172172    }
    173173
    174174    /**
    175175     * Constructs a new {@code JosmAction}.
    176176     */
    177     public JosmAction() {
     177    protected JosmAction() {
    178178        this(true);
    179179    }
    180180
    … …  
    183183     *
    184184     * @param installAdapters false, if you don't want to install layer changed and selection changed adapters
    185185     */
    186     public JosmAction(boolean installAdapters) {
     186    protected JosmAction(boolean installAdapters) {
    187187        setHelpId();
    188188        if (installAdapters) {
    189189            installAdapters();
    … …  
    202202     * @param shortcuts ready-created shortcut objects
    203203     * @since 14012
    204204     */
    205     public JosmAction(String name, String iconName, String tooltip, List<Shortcut> shortcuts) {
     205    protected JosmAction(String name, String iconName, String tooltip, List<Shortcut> shortcuts) {
    206206        this(name, iconName, tooltip, shortcuts.get(0), true, null, true);
    207207        for (int i = 1; i < shortcuts.size(); i++) {
    208208            MainApplication.registerActionShortcut(this, shortcuts.get(i));

  • src/org/openstreetmap/josm/actions/SaveActionBase.java

     
    4343     * @param tooltip A longer description of the action that will be displayed in the tooltip
    4444     * @param shortcut A ready-created shortcut object or {@code null} if you don't want a shortcut
    4545     */
    46     public SaveActionBase(String name, String iconName, String tooltip, Shortcut shortcut) {
     46    protected SaveActionBase(String name, String iconName, String tooltip, Shortcut shortcut) {
    4747        super(name, iconName, tooltip, shortcut);
    4848    }
    4949
    … …  
    5656     * @param quiet whether the quiet exporter is called
    5757     * @since 15496
    5858     */
    59     public SaveActionBase(String name, String iconName, String tooltip, Shortcut shortcut, boolean quiet) {
     59    protected SaveActionBase(String name, String iconName, String tooltip, Shortcut shortcut, boolean quiet) {
    6060        super(name, iconName, tooltip, shortcut);
    6161        this.quiet = quiet;
    6262    }

  • src/org/openstreetmap/josm/actions/ToggleAction.java

     
    3939     * @param toolbarId identifier for the toolbar preferences. The iconName is used, if this parameter is null
    4040     * @param installAdapters false, if you don't want to install layer changed and selection changed adapters
    4141     */
    42     public ToggleAction(String name, ImageProvider icon, String tooltip, Shortcut shortcut, boolean registerInToolbar,
     42    protected ToggleAction(String name, ImageProvider icon, String tooltip, Shortcut shortcut, boolean registerInToolbar,
    4343            String toolbarId, boolean installAdapters) {
    4444        super(name, icon, tooltip, shortcut, registerInToolbar, toolbarId, installAdapters);
    4545        // It is required to set the SELECTED_KEY to a non-null value in order to let Swing components update it
    … …  
    5959     *            the user CANNOT configure a shortcut for your action.
    6060     * @param registerInToolbar register this action for the toolbar preferences?
    6161     */
    62     public ToggleAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar) {
     62    protected ToggleAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar) {
    6363        super(name, iconName, tooltip, shortcut, registerInToolbar);
    6464        // It is required to set the SELECTED_KEY to a non-null value in order to let Swing components update it
    6565        setSelected(false);

  • src/org/openstreetmap/josm/actions/UnGlueAction.java

     
    450450
    451451    /**
    452452     * dupe all nodes that are selected, and put the copies on the selected way
    453      * @throws UserCancelException
    454      *
     453     * @throws UserCancelException if user cancels choice
    455454     */
    456455    private void unglueOneWayAnyNodes() throws UserCancelException {
    457456        final PropertiesMembershipChoiceDialog dialog =

  • src/org/openstreetmap/josm/actions/audio/AbstractAudioAction.java

     
    2121     * @param shortcut a ready-created shortcut object or null if you don't want a shortcut
    2222     * @param registerInToolbar register this action for the toolbar preferences?
    2323     */
    24     public AbstractAudioAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar) {
     24    protected AbstractAudioAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar) {
    2525        super(name, iconName, tooltip, shortcut, registerInToolbar);
    2626        updateEnabledState();
    2727    }

  • src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java

     
    2626     * @param shortcut a ready-created shortcut object.
    2727     * @param fast {@code true} to increase speed (faster audio), {@code false} to decrease it (slower audio).
    2828     */
    29     public AudioFastSlowAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean fast) {
     29    protected AudioFastSlowAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean fast) {
    3030        super(name, iconName, tooltip, shortcut, true);
    3131        multiplier = Config.getPref().getDouble("audio.fastfwdmultiplier", 1.3);
    3232        if (!fast)

  • src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java

     
    2424    /**
    2525     * Constructs a new {@code AbstractDownloadTask}.
    2626     */
    27     public AbstractDownloadTask() {
     27    protected AbstractDownloadTask() {
    2828        errorMessages = new ArrayList<>();
    2929    }
    3030

  • src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

     
    232232         * then use false unless you read result of task (because exception will get lost if you don't)
    233233         * @param zoomAfterDownload If true, the map view will zoom to download area after download
    234234         */
    235         public AbstractInternalTask(DownloadParams settings, String title, boolean ignoreException, boolean zoomAfterDownload) {
     235        protected AbstractInternalTask(DownloadParams settings, String title, boolean ignoreException, boolean zoomAfterDownload) {
    236236            super(title, ignoreException);
    237237            this.settings = Objects.requireNonNull(settings);
    238238            this.zoomAfterDownload = zoomAfterDownload;
    … …  
    248248         * then use false unless you read result of task (because exception will get lost if you don't)
    249249         * @param zoomAfterDownload If true, the map view will zoom to download area after download
    250250         */
    251         public AbstractInternalTask(DownloadParams settings, String title, ProgressMonitor progressMonitor, boolean ignoreException,
     251        protected AbstractInternalTask(DownloadParams settings, String title, ProgressMonitor progressMonitor, boolean ignoreException,
    252252                boolean zoomAfterDownload) {
    253253            super(title, progressMonitor, ignoreException);
    254254            this.settings = Objects.requireNonNull(settings);

  • src/org/openstreetmap/josm/actions/mapmode/MapMode.java

     
    4343     * @param cursor cursor displayed when map mode is active
    4444     * @since 11713
    4545     */
    46     public MapMode(String name, String iconName, String tooltip, Shortcut shortcut, Cursor cursor) {
     46    protected MapMode(String name, String iconName, String tooltip, Shortcut shortcut, Cursor cursor) {
    4747        super(name, "mapmode/"+iconName, tooltip, shortcut, false);
    4848        this.cursor = cursor;
    4949        putValue("active", Boolean.FALSE);
    … …  
    5757     * @param cursor cursor displayed when map mode is active
    5858     * @since 11713
    5959     */
    60     public MapMode(String name, String iconName, String tooltip, Cursor cursor) {
     60    protected MapMode(String name, String iconName, String tooltip, Cursor cursor) {
    6161        putValue(NAME, name);
    6262        new ImageProvider("mapmode", iconName).getResource().attachImageIcon(this);
    6363        putValue(SHORT_DESCRIPTION, tooltip);

  • src/org/openstreetmap/josm/command/Command.java

     
    134134     * @throws IllegalArgumentException if data is null
    135135     * @since 11240
    136136     */
    137     public Command(DataSet data) {
     137    protected Command(DataSet data) {
    138138        CheckParameterUtil.ensureParameterNotNull(data, "data");
    139139        this.data = data;
    140140    }

  • src/org/openstreetmap/josm/command/TransformNodesCommand.java

     
    5050     * @throws NullPointerException if objects is null or contain null item
    5151     * @throws NoSuchElementException if objects is empty
    5252     */
    53     public TransformNodesCommand(Collection<? extends OsmPrimitive> objects) {
     53    protected TransformNodesCommand(Collection<? extends OsmPrimitive> objects) {
    5454        super(objects.iterator().next().getDataSet());
    5555        this.nodes = AllNodesVisitor.getAllNodes(objects);
    5656        storeOldState();

  • src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java

     
    2828     * Constructs a new {@code ConflictResolveCommand} in the context of a given data set.
    2929     * @param ds the data set. Must not be null.
    3030     */
    31     public ConflictResolveCommand(DataSet ds) {
     31    protected ConflictResolveCommand(DataSet ds) {
    3232        super(ds);
    3333    }
    3434

  • src/org/openstreetmap/josm/data/Bounds.java

     
    360360    }
    361361
    362362    /**
     363     * Returns center of the bounding box.
    363364     * @return Center of the bounding box.
    364365     */
    365366    public LatLon getCenter() {

  • src/org/openstreetmap/josm/data/cache/CacheEntry.java

     
    2121    }
    2222
    2323    /**
     24     * Returns cache entry content.
    2425     * @return cache entry content
    2526     */
    2627    public byte[] getContent() {

  • src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java

     
    5353    }
    5454
    5555    /**
     56     * Determines if the entry is marked as "no tile at this zoom level".
    5657     * @return if the entry is marked as "no tile at this zoom level"
    5758     */
    5859    public boolean isNoTileAtZoom() {
    … …  
    6869    }
    6970
    7071    /**
     72     * Returns ETag header value, that was returned for this entry.
    7173     * @return ETag header value, that was returned for this entry.
    7274     */
    7375    public String getEtag() {
    … …  
    100102    }
    101103
    102104    /**
     105     * Returns last modification of the object in cache in milliseconds from Epoch.
    103106     * @return last modification of the object in cache in milliseconds from Epoch
    104107     */
    105108    public long getLastModification() {
    … …  
    116119    }
    117120
    118121    /**
     122     * Returns when the object expires in milliseconds from Epoch.
    119123     * @return when the object expires in milliseconds from Epoch
    120124     */
    121125    public long getExpirationTime() {
    … …  
    142146    }
    143147
    144148    /**
     149     * Returns HTTP response code.
    145150     * @return http status code
    146151     * @since 8389
    147152     */
    … …  
    177182    }
    178183
    179184    /**
     185     * Returns error message returned while retrieving this object.
    180186     * @return error message returned while retrieving this object
    181187     */
    182188    public String getErrorMessage() {
    … …  
    184190    }
    185191
    186192    /**
     193     * Sets error related to this object.
    187194     * @param error error related to this object
    188195     * @since 10469
    189196     */
    … …  
    192199    }
    193200
    194201    /**
     202     * Sets error message related to this object.
    195203     * @param message error message related to this object
    196204     */
    197205    public void setErrorMessage(String message) {
    … …  
    199207    }
    200208
    201209    /**
     210     * Sets exception that caused error.
    202211     * @param e exception that caused error
    203      *
    204212     */
    205213    public void setException(Exception e) {
    206214        attrs.put(EXCEPTION, e.getClass().getCanonicalName());
    207215    }
    208216
    209217    /**
     218     * Returns optional exception that was thrown when fetching resource.
    210219     * @return Optional exception that was thrown when fetching resource
    211      *
    212220     */
    213221    public Optional<Class<? extends Exception>> getException() {
    214222        String className = attrs.get(EXCEPTION);

  • src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

     
    9999     * @param options options of the request
    100100     * @param downloadJobExecutor that will be executing the jobs
    101101     */
    102     public JCSCachedTileLoaderJob(ICacheAccess<K, V> cache,
     102    protected JCSCachedTileLoaderJob(ICacheAccess<K, V> cache,
    103103            TileJobOptions options,
    104104            ThreadPoolExecutor downloadJobExecutor) {
    105105        CheckParameterUtil.ensureParameterNotNull(cache, "cache");
    … …  
    116116     * @param cache cache instance that we will work on
    117117     * @param options of the request
    118118     */
    119     public JCSCachedTileLoaderJob(ICacheAccess<K, V> cache,
     119    protected JCSCachedTileLoaderJob(ICacheAccess<K, V> cache,
    120120            TileJobOptions options) {
    121121        this(cache, options, DEFAULT_DOWNLOAD_JOB_DISPATCHER);
    122122    }
    … …  
    173173    }
    174174
    175175    /**
    176      *
    177      * @return checks if object from cache has sufficient data to be returned
     176     * Checks if object from cache has sufficient data to be returned.
     177     * @return {@code true} if object from cache has sufficient data to be returned
    178178     */
    179179    protected boolean isObjectLoadable() {
    180180        if (cacheData == null) {
    … …  
    194194    }
    195195
    196196    /**
     197     * Returns key under which discovered server settings will be kept.
    197198     * @return key under which discovered server settings will be kept
    198199     */
    199200    protected String getServerKey() {

  • src/org/openstreetmap/josm/data/conflict/Conflict.java

     
    9797    }
    9898
    9999    /**
    100      *
     100     * Determines if my primitive was deleted but it has set non deleted status.
    101101     * @return True if my primitive was deleted but it has set non deleted status because it's referred by another
    102102     * primitive and references to deleted primitives are not allowed.
    103103     */

  • src/org/openstreetmap/josm/data/coor/LatLon.java

     
    181181    }
    182182
    183183    /**
     184     * Determines if the other point has almost the same lat/lon values.
    184185     * @param other other lat/lon
    185186     * @return <code>true</code> if the other point has almost the same lat/lon
    186187     * values, only differing by no more than 1 / {@link #MAX_SERVER_PRECISION MAX_SERVER_PRECISION}.

  • src/org/openstreetmap/josm/data/gpx/GpxData.java

     
    11651165    }
    11661166
    11671167    /**
     1168     * Determines whether anything has been modified.
    11681169     * @return whether anything has been modified (e.g. colors)
    11691170     * @since 15496
    11701171     */
    … …  
    12131214        }
    12141215
    12151216        /**
    1216          * @return the URI of the namesapce
     1217         * Returns the URI of the namespace.
     1218         * @return the URI of the namespace
    12171219         */
    12181220        public String getURI() {
    12191221            return uri;
    12201222        }
    12211223
    12221224        /**
     1225         * Returns the prefix of the namespace.
    12231226         * @return the prefix of the namespace, determined from URI if possible
    12241227         */
    12251228        public String getPrefix() {
    … …  
    12271230        }
    12281231
    12291232        /**
     1233         * Returns the location of the schema.
    12301234         * @return the location of the schema
    12311235         */
    12321236        public String getLocation() {

  • src/org/openstreetmap/josm/data/gpx/GpxExtension.java

     
    9393    }
    9494
    9595    /**
     96     * Returns the qualified name of the XML element.
    9697     * @return the qualified name of the XML element
    9798     */
    9899    public String getQualifiedName() {
    … …  
    100101    }
    101102
    102103    /**
     104     * Returns the prefix of the XML namespace.
    103105     * @return the prefix of the XML namespace
    104106     */
    105107    public String getPrefix() {
    … …  
    107109    }
    108110
    109111    /**
     112     * Returns the key (local element name) of the extension.
    110113     * @return the key (local element name) of the extension
    111114     */
    112115    public String getKey() {
    … …  
    114117    }
    115118
    116119    /**
     120     * Returns the flattened extension key of this extension.
    117121     * @return the flattened extension key of this extension, used for conversion to OSM layers
    118122     */
    119123    public String getFlatKey() {
    120124        String ret = "";
    121         if (parent != null && parent instanceof GpxExtension) {
     125        if (parent instanceof GpxExtension) {
    122126            GpxExtension ext = (GpxExtension) parent;
    123127            ret = ext.getFlatKey() + ":";
    124128        }
    … …  
    143147    }
    144148
    145149    /**
     150     * Returns the value of the extension.
    146151     * @return the value of the extension
    147152     */
    148153    public String getValue() {
    … …  
    150155    }
    151156
    152157    /**
     158     * Sets the value.
    153159     * @param value the value to set
    154160     */
    155161    public void setValue(String value) {
    … …  
    203209    }
    204210
    205211    /**
     212     * Determines if this extension should be written.
    206213     * @return if this extension should be written, used for hiding colors during export without removing them
    207214     */
    208215    public boolean isVisible() {
    … …  
    210217    }
    211218
    212219    /**
     220     * Returns the parent element of this extension.
    213221     * @return the parent element of this extension, can be another extension or gpx elements (data, track, segment, ...)
    214222     */
    215223    public IWithAttributes getParent() {

  • src/org/openstreetmap/josm/data/gpx/GpxExtensionCollection.java

     
    249249    }
    250250
    251251    /**
     252     * Determines if this collection contains writable extensions.
    252253     * @return <code>true</code> if this collection contains writable extensions
    253254     */
    254255    public boolean isVisible() {

  • src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java

     
    4343     * @param info tile source info
    4444     * @param tileProjection the tile projection
    4545     */
    46     public AbstractWMSTileSource(TileSourceInfo info, Projection tileProjection) {
     46    protected AbstractWMSTileSource(TileSourceInfo info, Projection tileProjection) {
    4747        super(info);
    4848        this.tileProjection = tileProjection;
    4949    }

  • src/org/openstreetmap/josm/data/imagery/DefaultLayer.java

     
    4040    }
    4141
    4242    /**
     43     * Returns layer name of the default layer.
    4344     * @return layer name of the default layer
    4445     */
    4546    public String getLayerName() {
    … …  
    4748    }
    4849
    4950    /**
     51     * Returns default tileMatrixSet. Only usable for WMTS
    5052     * @return default tileMatrixSet. Only usable for WMTS
    5153     */
    5254    public String getTileMatrixSet() {
    … …  
    5456    }
    5557
    5658    /**
     59     * Returns style for this WMS / WMTS layer to use.
    5760     * @return style for this WMS / WMTS layer to use
    5861     */
    5962    public String getStyle() {
    … …  
    6164    }
    6265
    6366    /**
     67     * Returns JSON representation of the default layer object.
    6468     * @return JSON representation of the default layer object
    6569     */
    6670    public JsonObject toJson() {

  • src/org/openstreetmap/josm/data/imagery/LayerDetails.java

     
    4444    }
    4545
    4646    /**
     47     * Returns projections that are supported by this layer.
    4748     * @return projections that are supported by this layer
    4849     */
    4950    public Collection<String> getCrs() {
    … …  
    5657    }
    5758
    5859    /**
    59      *
     60     * Returns styles defined for this layer.
    6061     * @return styles defined for this layer
    6162     */
    6263    public Map<String, String> getStyles() {
    … …  
    6970    }
    7071
    7172    /**
    72      * @return title "Human readable" title of this layer
     73     * Returns "Human readable" title of this layer
     74     * @return "Human readable" title of this layer
    7375     * @see LayerDetails#getName()
    7476     */
    7577    public String getTitle() {
    … …  
    7779    }
    7880
    7981    /**
    80      * @param title set title of this layer
     82     * Sets title of this layer
     83     * @param title title of this layer
    8184     * @see LayerDetails#getName()
    8285     */
    8386    public void setTitle(String title) {
    … …  
    103106    }
    104107
    105108    /**
    106      * @param name sets the name of this Layer
     109     * Sets the name of this Layer.
     110     * @param name the name of this Layer
    107111     * @see LayerDetails#getName()
    108112     */
    109113    public void setName(String name) {
    … …  
    128132    }
    129133
    130134    /**
    131      *
     135     * Returns bounds within layer might be queried.
    132136     * @return bounds within layer might be queried
    133137     */
    134138    public Bounds getBounds() {
    … …  
    136140    }
    137141
    138142    /**
    139      * sets bounds of this layer
     143     * Sets bounds of this layer
    140144     * @param bounds of this layer
    141145     */
    142146    public void setBounds(Bounds bounds) {
    … …  
    150154    }
    151155
    152156    /**
    153      *
    154      * @return parent layer for his layer
     157     * Returns parent layer for this layer.
     158     * @return parent layer for this layer
    155159     */
    156160    public LayerDetails getParent() {
    157161        return parentLayer;
    … …  
    167171    }
    168172
    169173    /**
    170      *
     174     * Returns children layers of this layer.
    171175     * @return children layers of this layer
    172176     */
    173177    public List<LayerDetails> getChildren() {
    … …  
    183187    }
    184188
    185189    /**
     190     * Returns abstract of this layer.
    186191     * @return "Narrative description of the layer"
    187192     */
    188193    public String getAbstract() {
    … …  
    198203    }
    199204
    200205    /**
     206     * Returns flattened stream of this layer and its children.
    201207     * @return flattened stream of this layer and its children (as well as recursively children of its children)
    202208     */
    203209    public Stream<LayerDetails> flattened() {

  • src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java

     
    6262    }
    6363
    6464    /**
     65     * Returns a new {@link ThreadPoolExecutor}.
    6566     * @param nameFormat see {@link Utils#newThreadFactory(String, int)}
    6667     * @param workers number of worker thread to keep
    6768     * @return new ThreadPoolExecutor that will use a @see HostLimitQueue based queue
    … …  
    7172    }
    7273
    7374    /**
     75     * Returns a new {@link ThreadPoolExecutor}.
    7476     * @param nameFormat see {@link Utils#newThreadFactory(String, int)}
    7577     * @param workers number of worker thread to keep
    7678     * @param hostLimit number of concurrent downloads per host allowed
    … …  
    8890    }
    8991
    9092    /**
     93     * Returns a new {@link ThreadPoolExecutor}.
    9194     * @param name name of threads
    92      * @return new ThreadPoolExecutor that will use a @see HostLimitQueue based queue, with default number of threads
     95     * @return new ThreadPoolExecutor that will use a {@link HostLimitQueue} based queue, with default number of threads
    9396     */
    9497    public static ThreadPoolExecutor getNewThreadPoolExecutor(String name) {
    9598        return getNewThreadPoolExecutor(name, THREAD_LIMIT.get().intValue());
    … …  
    111114    }
    112115
    113116    /**
     117     * Returns cache statistics as string.
    114118     * @return cache statistics as string
    115119     */
    116120    public String getStats() {
    … …  
    147151    }
    148152
    149153    /**
     154     * Returns download executor that is used by this factory.
    150155     * @return download executor that is used by this factory
    151156     */
    152157    public ThreadPoolExecutor getDownloadExecutor() {

  • src/org/openstreetmap/josm/data/imagery/TileJobOptions.java

     
    88 * Class containing all options that are passed from Layer to TileJob
    99 *
    1010 * @author Wiktor Niesiobedzki
    11  *
     11 * @since 13733
    1212 */
    1313public class TileJobOptions {
    1414
    … …  
    3333    }
    3434
    3535    /**
    36      *
     36     * Returns socket connection timeout in milliseconds.
    3737     * @return socket connection timeout in milliseconds
    3838     */
    3939    public int getConnectionTimeout() {
    … …  
    4141    }
    4242
    4343    /**
    44      *
     44     * Returns socket read timeout in milliseconds.
    4545     * @return socket read timeout in milliseconds
    4646     */
    4747    public int getReadTimeout() {
    … …  
    4949    }
    5050
    5151    /**
    52      *
     52     * Returns unmodifiable map with headers to be sent to tile server.
    5353     * @return unmodifiable map with headers to be sent to tile server
    5454     */
    5555    public Map<String, String> getHeaders() {
    … …  
    5757    }
    5858
    5959    /**
    60      *
     60     * Returns minimum cache expire time in seconds for downloaded tiles.
    6161     * @return minimum cache expire time in seconds for downloaded tiles
    6262     */
    6363    public long getMinimumExpiryTime() {

  • src/org/openstreetmap/josm/data/imagery/WMSEndpointTileSource.java

     
    8585    }
    8686
    8787    /**
    88      *
     88     * Returns list of EPSG codes that current layer selection supports.
    8989     * @return list of EPSG codes that current layer selection supports (this may differ from layer to layer)
    9090     */
    9191    public List<String> getServerProjections() {

  • src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

     
    174174        }
    175175
    176176        /**
    177          *
     177         * Returns identifier of this TileMatrixSet.
    178178         * @return identifier of this TileMatrixSet
    179179         */
    180180        public String getIdentifier() {
    … …  
    182182        }
    183183
    184184        /**
    185          *
     185         * Returns projection of this tileMatrix.
    186186         * @return projection of this tileMatrix
    187187         */
    188188        public String getCrs() {
    … …  
    253253        }
    254254
    255255        /**
    256          *
     256         * Returns identifier of this layer.
    257257         * @return identifier of this layer
    258258         */
    259259        public String getIdentifier() {
    … …  
    261261        }
    262262
    263263        /**
    264          *
     264         * Returns style of this layer.
    265265         * @return style of this layer
    266266         */
    267267        public String getStyle() {
    … …  
    269269        }
    270270
    271271        /**
    272          *
     272         * Returns tileMatrixSet of this layer.
    273273         * @return tileMatrixSet of this layer
    274274         */
    275275        public TileMatrixSet getTileMatrixSet() {
    … …  
    10681068    }
    10691069
    10701070    /**
     1071     * Group layers by name and tile matrix set.
    10711072     * @param layers to be grouped
    10721073     * @return list with entries - grouping identifier + list of layers
    10731074     */
    … …  
    10781079    }
    10791080
    10801081    /**
     1082     * Returns set of projection codes that this TileSource supports.
    10811083     * @return set of projection codes that this TileSource supports
    10821084     */
    10831085    public Collection<String> getSupportedProjections() {

  • src/org/openstreetmap/josm/data/osm/AbstractDataSourceChangeEvent.java

     
    2323     * @param source The DataSet that is originating the change
    2424     * @param old    The previous set of DataSources
    2525     */
    26     public AbstractDataSourceChangeEvent(DataSet source, Set<DataSource> old) {
     26    protected AbstractDataSourceChangeEvent(DataSet source, Set<DataSource> old) {
    2727        CheckParameterUtil.ensureParameterNotNull(source, "source");
    2828        CheckParameterUtil.ensureParameterNotNull(old, "old");
    2929        this.source = source;

  • src/org/openstreetmap/josm/data/osm/BBox.java

     
    377377    }
    378378
    379379    /**
    380      * @return true if the bbox covers a part of the planets surface
     380     * Determines if the bbox covers a part of the planet surface.
     381     * @return true if the bbox covers a part of the planet surface.
    381382     * Height and width must be non-negative, but may (both) be 0.
    382383     * @since 11269
    383384     */
    … …  
    386387    }
    387388
    388389    /**
    389      * @return true if the bbox  is avalid and covers a part of the planets surface
     390     * Determines if the bbox is valid and covers a part of the planet surface.
     391     * @return true if the bbox is valid and covers a part of the planet surface
    390392     * @since 11269
    391393     */
    392394    public boolean isInWorld() {

  • src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java

     
    176176    }
    177177
    178178    /**
     179     * Returns an unmodifiable set of all primitives in this dataset.
    179180     * @return an unmodifiable set of all primitives in this dataset.
    180181     * @since 14946
    181182     */

  • src/org/openstreetmap/josm/data/osm/DataSelectionListener.java

     
    9595        private final DataSet source;
    9696        private final Set<OsmPrimitive> old;
    9797
    98         public AbstractSelectionEvent(DataSet source, Set<OsmPrimitive> old) {
     98        protected AbstractSelectionEvent(DataSet source, Set<OsmPrimitive> old) {
    9999            CheckParameterUtil.ensureParameterNotNull(source, "source");
    100100            CheckParameterUtil.ensureParameterNotNull(old, "old");
    101101            this.source = source;

  • src/org/openstreetmap/josm/data/osm/DataSet.java

     
    12771277    }
    12781278
    12791279    /**
     1280     * Determines if this Dataset contains no primitives.
    12801281     * @return true if this Dataset contains no primitives
    12811282     * @since 14835
    12821283     */

  • src/org/openstreetmap/josm/data/osm/Hash.java

     
    55 * An interface allowing injection of hashcode and equality implementation
    66 * based on some inner state of an object for a set.
    77 * It supports two type parameters to implement effective foreign key implementation
    8  * inside (@link Storage}, but for basic use, both type parameters are the same.
     8 * inside {@link Storage}, but for basic use, both type parameters are the same.
    99 *
    1010 * For use cases, see {@link Storage}.
    1111 * @author nenik

  • src/org/openstreetmap/josm/data/osm/Node.java

     
    128128        }
    129129    }
    130130
    131     protected Node(long id, boolean allowNegative) {
     131    Node(long id, boolean allowNegative) {
    132132        super(id, allowNegative);
    133133    }
    134134

  • src/org/openstreetmap/josm/data/osm/PrimitiveData.java

     
    3131     * @param id id
    3232     * @since 12017
    3333     */
    34     public PrimitiveData(long id) {
     34    protected PrimitiveData(long id) {
    3535        this.id = id;
    3636    }
    3737
    … …  
    3939     * Constructs a new {@code PrimitiveData} from an existing one.
    4040     * @param data the data to copy
    4141     */
    42     public PrimitiveData(PrimitiveData data) {
     42    protected PrimitiveData(PrimitiveData data) {
    4343        cloneFrom(data);
    4444    }
    4545

  • src/org/openstreetmap/josm/data/osm/Relation.java

     
    181181        visitor.visit(this);
    182182    }
    183183
    184     protected Relation(long id, boolean allowNegative) {
     184    Relation(long id, boolean allowNegative) {
    185185        super(id, allowNegative);
    186186    }
    187187

  • src/org/openstreetmap/josm/data/osm/Way.java

     
    181181        visitor.visit(this);
    182182    }
    183183
    184     protected Way(long id, boolean allowNegative) {
     184    Way(long id, boolean allowNegative) {
    185185        super(id, allowNegative);
    186186    }
    187187

  • src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java

     
    5353     *
    5454     * @throws IllegalArgumentException if preconditions are violated
    5555     */
    56     public HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Date timestamp) {
     56    protected HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Date timestamp) {
    5757        this(id, version, visible, user, changesetId, timestamp, true);
    5858    }
    5959
    … …  
    7272     * @throws IllegalArgumentException if preconditions are violated
    7373     * @since 5440
    7474     */
    75     public HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Date timestamp,
     75    protected HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Date timestamp,
    7676            boolean checkHistoricParams) {
    7777        ensurePositiveLong(id, "id");
    7878        ensurePositiveLong(version, "version");
    … …  
    9494     * Constructs a new {@code HistoryOsmPrimitive} from an existing {@link OsmPrimitive}.
    9595     * @param p the primitive
    9696     */
    97     public HistoryOsmPrimitive(OsmPrimitive p) {
     97    protected HistoryOsmPrimitive(OsmPrimitive p) {
    9898        this(p.getId(), p.getVersion(), p.isVisible(), p.getUser(), p.getChangesetId(), p.getTimestamp());
    9999    }
    100100

  • src/org/openstreetmap/josm/data/osm/search/PushbackTokenizer.java

     
    3737        }
    3838
    3939        /**
     40         * Returns the range start.
    4041         * @return The start
    4142         */
    4243        public long getStart() {
    … …  
    4445        }
    4546
    4647        /**
     48         * Returns the range end.
    4749         * @return The end (inclusive)
    4850         */
    4951        public long getEnd() {

  • src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

     
    334334
    335335        protected final Match match;
    336336
    337         public UnaryMatch(Match match) {
     337        protected UnaryMatch(Match match) {
    338338            if (match == null) {
    339339                // "operator" (null) should mean the same as "operator()"
    340340                // (Always). I.e. match everything
    … …  
    382382         * @param lhs Left hand side
    383383         * @param rhs Right hand side
    384384         */
    385         public AbstractBinaryMatch(Match lhs, Match rhs) {
     385        protected AbstractBinaryMatch(Match lhs, Match rhs) {
    386386            this.lhs = lhs;
    387387            this.rhs = rhs;
    388388        }

  • src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

     
    134134    }
    135135
    136136    /**
     137     * Returns the bounding box.
    137138     * @return The bounding box or <code>null</code> if no coordinates have passed
    138139     */
    139140    public ProjectionBounds getBounds() {

  • src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java

     
    7474     * @throws IllegalArgumentException if {@code g} is null
    7575     * @throws IllegalArgumentException if {@code nc} is null
    7676     */
    77     public AbstractMapRenderer(Graphics2D g, NavigatableComponent nc, boolean isInactiveMode) {
     77    protected AbstractMapRenderer(Graphics2D g, NavigatableComponent nc, boolean isInactiveMode) {
    7878        CheckParameterUtil.ensureParameterNotNull(g);
    7979        CheckParameterUtil.ensureParameterNotNull(nc);
    8080        this.g = g;

  • src/org/openstreetmap/josm/data/preferences/AbstractProperty.java

     
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.data.preferences;
    33
     4import java.util.Objects;
     5
    46import org.openstreetmap.josm.spi.preferences.Config;
    57import org.openstreetmap.josm.spi.preferences.IPreferences;
    68import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
    … …  
    810import org.openstreetmap.josm.tools.ListenableWeakReference;
    911import org.openstreetmap.josm.tools.bugreport.BugReport;
    1012
    11 import java.util.Objects;
    12 
    1313/**
    1414 * Captures the common functionality of preference properties
    1515 * @param <T> The type of object accessed by this property
    … …  
    159159     * @param defaultValue The default value
    160160     * @since 5464
    161161     */
    162     public AbstractProperty(String key, T defaultValue) {
     162    protected AbstractProperty(String key, T defaultValue) {
    163163        // Config.getPref() should not change in production but may change during tests.
    164164        preferences = Config.getPref();
    165165        this.key = key;

  • src/org/openstreetmap/josm/data/preferences/AbstractToStringProperty.java

     
    7676     * @param defaultValue The default value.
    7777     * @see AbstractProperty#AbstractProperty(String, Object)
    7878     */
    79     public AbstractToStringProperty(String key, T defaultValue) {
     79    protected AbstractToStringProperty(String key, T defaultValue) {
    8080        super(key, defaultValue);
    8181        storeDefaultValue();
    8282    }

  • src/org/openstreetmap/josm/data/preferences/ParametrizedEnumProperty.java

     
    1414    protected final T defaultValue;
    1515    protected final Class<T> enumClass;
    1616
    17     public ParametrizedEnumProperty(Class<T> enumClass, T defaultValue) {
     17    protected ParametrizedEnumProperty(Class<T> enumClass, T defaultValue) {
    1818        this.defaultValue = defaultValue;
    1919        this.enumClass = enumClass;
    2020    }

  • src/org/openstreetmap/josm/data/preferences/sources/ExtendedSourceEntry.java

     
    4141    }
    4242
    4343    /**
     44     * Returns string representation for GUI list or menu entry.
    4445     * @return string representation for GUI list or menu entry
    4546     */
    4647    public String getDisplayName() {

  • src/org/openstreetmap/josm/data/preferences/sources/SourcePrefHelper.java

     
    2929     * @param type The source type
    3030     * @since 12825
    3131     */
    32     public SourcePrefHelper(String pref, SourceType type) {
     32    protected SourcePrefHelper(String pref, SourceType type) {
    3333        this.pref = pref;
    3434        this.type = type;
    3535    }

  • src/org/openstreetmap/josm/data/projection/AbstractProjection.java

     
    180180    }
    181181
    182182    /**
     183     * Returns The EPSG Code of this CRS.
    183184     * @return The EPSG Code of this CRS, null if it doesn't have one.
    184185     */
    185186    public abstract Integer getEpsgCode();

  • src/org/openstreetmap/josm/data/projection/datum/AbstractDatum.java

     
    2121     * @param proj4Id The Proj4 identifier
    2222     * @param ellps The ellipsoid
    2323     */
    24     public AbstractDatum(String name, String proj4Id, Ellipsoid ellps) {
     24    protected AbstractDatum(String name, String proj4Id, Ellipsoid ellps) {
    2525        this.name = name;
    2626        this.proj4Id = proj4Id;
    2727        this.ellps = ellps;

  • src/org/openstreetmap/josm/data/projection/datum/Datum.java

     
    1313public interface Datum {
    1414
    1515    /**
     16     * Returns a human readable name of this projection.
    1617     * @return a human readable name of this projection
    1718     */
    1819    String getName();
    … …  
    2526    String getProj4Id();
    2627
    2728    /**
     29     * Returns the ellipsoid associated with this datum.
    2830     * @return the ellipsoid associated with this datum
    2931     */
    3032    Ellipsoid getEllipsoid();

  • src/org/openstreetmap/josm/data/validation/Test.java

     
    106106         * @param name The test name
    107107         * @param description The test description
    108108         */
    109         public TagTest(String name, String description) {
     109        protected TagTest(String name, String description) {
    110110            super(name, description);
    111111        }
    112112
    … …  
    114114         * Constructs a new {@code TagTest} with given name.
    115115         * @param name The test name
    116116         */
    117         public TagTest(String name) {
     117        protected TagTest(String name) {
    118118            super(name);
    119119        }
    120120
    … …  
    376376    }
    377377
    378378    /**
     379     * Returns the name of this class.
    379380     * @return the name of this class (for ToolTip)
    380      * since 15972
     381     * @since 15972
    381382     */
    382383    public Object getSource() {
    383384        return "Java: " + this.getClass().getName();

  • src/org/openstreetmap/josm/data/validation/TestError.java

     
    530530    }
    531531
    532532    /**
     533     * Returns a new {@link MultipleNameVisitor} for the list of primitives affected by this error.
    533534     * @return Name visitor (used in cell renderer and for sorting)
    534535     */
    535536    public MultipleNameVisitor getNameVisitor() {

  • src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java

     
    303303     * @param code The test code
    304304     * @since 12958
    305305     */
    306     public CrossingWays(String title, int code) {
     306    protected CrossingWays(String title, int code) {
    307307        super(title, tr("This test checks if two roads, railways, waterways or buildings crosses in the same layer, " +
    308308                "but are not connected by a node."));
    309309        this.code = code;

  • src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java

     
    210210     * @param title The test title
    211211     * @since 6691
    212212     */
    213     public UnconnectedWays(String title) {
     213    protected UnconnectedWays(String title) {
    214214        this(title, UNCONNECTED_WAYS, false);
    215 
    216215    }
    217216
    218217    /**
    … …  
    222221     * @param isHighwayTest use {@code true} if test concerns highways or railways
    223222     * @since 14468
    224223     */
    225     public UnconnectedWays(String title, int code, boolean isHighwayTest) {
     224    protected UnconnectedWays(String title, int code, boolean isHighwayTest) {
    226225        super(title, tr("This test checks if a way has an endpoint very near to another way."));
    227226        this.code = code;
    228227        this.isHighwayTest = isHighwayTest;

  • src/org/openstreetmap/josm/gui/MainMenu.java

     
    470470    };
    471471
    472472    /**
     473     * Returns the default position of new top-level menus.
    473474     * @return the default position of new top-level menus
    474475     * @since 6088
    475476     */

  • src/org/openstreetmap/josm/gui/MapViewState.java

     
    333333    }
    334334
    335335    /**
     336     * Creates a new state that is moved to an east/north coordinate.
    336337     * @param mapViewPoint The reference point.
    337338     * @param newEastNorthThere The east/north coordinate that should be there.
    338339     * @return The new state.

  • src/org/openstreetmap/josm/gui/NavigatableComponent.java

     
    430430    }
    431431
    432432    /**
     433     * Returns geographic coordinates from a specific pixel coordination on the screen.
    433434     * @param x X-Pixelposition to get coordinate from
    434435     * @param y Y-Pixelposition to get coordinate from
    435436     *
    … …  
    491492    }
    492493
    493494    /**
     495     * Returns minimum bounds that will cover a given rectangle.
    494496     * @param r rectangle
    495497     * @return Minimum bounds that will cover rectangle
    496498     */
    … …  
    12351237
    12361238    /**
    12371239     * The result *order* depends on the current map selection state.
    1238      * Segments within 10px of p are searched and sorted by their distance to @param p,
     1240     * Segments within 10px of p are searched and sorted by their distance to {@code p},
    12391241     * then, within groups of equally distant segments, prefer those that are selected.
    12401242     *
    12411243     * @param p the point for which to search the nearest segments.
    … …  
    16361638    }
    16371639
    16381640    /**
     1641     * Returns the projection to be used in calculating stuff.
    16391642     * @return The projection to be used in calculating stuff.
    16401643     */
    16411644    public Projection getProjection() {

  • src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java

     
    3434     * Create the runnable object with a given message for the user.
    3535     * @param title message for the user
    3636     */
    37     public PleaseWaitRunnable(String title) {
     37    protected PleaseWaitRunnable(String title) {
    3838        this(title, false);
    3939    }
    4040
    … …  
    4646     * exception will be handled by showing a dialog. When this runnable is executed using executor framework
    4747     * then use false unless you read result of task (because exception will get lost if you don't)
    4848     */
    49     public PleaseWaitRunnable(String title, boolean ignoreException) {
     49    protected PleaseWaitRunnable(String title, boolean ignoreException) {
    5050        this(title, new PleaseWaitProgressMonitor(title), ignoreException);
    5151    }
    5252
    … …  
    6060     * then use false unless you read result of task (because exception will get lost if you don't)
    6161     * @throws IllegalArgumentException if parent is null
    6262     */
    63     public PleaseWaitRunnable(Component parent, String title, boolean ignoreException) {
     63    protected PleaseWaitRunnable(Component parent, String title, boolean ignoreException) {
    6464        CheckParameterUtil.ensureParameterNotNull(parent, "parent");
    6565        this.title = title;
    6666        this.progressMonitor = new PleaseWaitProgressMonitor(parent, title);
    … …  
    7676     * exception will be handled by showing a dialog. When this runnable is executed using executor framework
    7777     * then use false unless you read result of task (because exception will get lost if you don't)
    7878     */
    79     public PleaseWaitRunnable(String title, ProgressMonitor progressMonitor, boolean ignoreException) {
     79    protected PleaseWaitRunnable(String title, ProgressMonitor progressMonitor, boolean ignoreException) {
    8080        this.title = title;
    8181        this.progressMonitor = progressMonitor == null ? new PleaseWaitProgressMonitor(title) : progressMonitor;
    8282        this.ignoreException = ignoreException;

  • src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java

     
    198198    /**
    199199     * Constructs a new {@code ListMergeModel}.
    200200     */
    201     public AbstractListMergeModel() {
     201    protected AbstractListMergeModel() {
    202202        entries = new EnumMap<>(ListRole.class);
    203203        for (ListRole role : ListRole.values()) {
    204204            entries.put(role, new ArrayList<T>());

  • src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMerger.java

     
    407407     * Constructs a new {@code ListMerger}.
    408408     * @param model list merger model
    409409     */
    410     public AbstractListMerger(AbstractListMergeModel<T, C> model) {
     410    protected AbstractListMerger(AbstractListMergeModel<T, C> model) {
    411411        this.model = model;
    412412        model.addChangeListener(this);
    413413        build();

  • src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java

     
    184184    /**
    185185     * Create a new merge panel.
    186186     */
    187     public AbstractMergePanel() {
     187    protected AbstractMergePanel() {
    188188        super(new GridBagLayout());
    189189    }
    190190

  • src/org/openstreetmap/josm/gui/conflict/pair/PairTable.java

     
    2727     * @param cm column model
    2828     * @param sm selection model
    2929     */
    30     public PairTable(String name, AbstractListMergeModel<? extends PrimitiveId, ? extends ConflictResolveCommand> model,
     30    protected PairTable(String name, AbstractListMergeModel<? extends PrimitiveId, ? extends ConflictResolveCommand> model,
    3131            OsmPrimitivesTableModel dm, TableColumnModel cm, ListSelectionModel sm) {
    3232        super(dm, cm, sm);
    3333        this.model = model;

  • src/org/openstreetmap/josm/gui/correction/CorrectionTableModel.java

     
    2424     * Constructs a new {@code CorrectionTableModel}.
    2525     * @param corrections list of corrections
    2626     */
    27     public CorrectionTableModel(List<C> corrections) {
     27    protected CorrectionTableModel(List<C> corrections) {
    2828        this.corrections = corrections;
    2929        apply = new boolean[this.corrections.size()];
    3030        Arrays.fill(apply, true);

  • src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

     
    10321032    }
    10331033
    10341034    /**
     1035     * Returns the last used height stored in preferences or preferredHeight.
    10351036     * @return the last used height stored in preferences or preferredHeight
    10361037     * @since 14425
    10371038     */

  • src/org/openstreetmap/josm/gui/dialogs/properties/AbstractCopyAction.java

     
    3232     * @param keySupplier a supplier which returns the selected key for a given row index
    3333     * @param objectSupplier a supplier which returns the selected tagged object(s)
    3434     */
    35     public AbstractCopyAction(JTable tagTable, IntFunction<String> keySupplier, Supplier<Collection<? extends Tagged>> objectSupplier) {
     35    protected AbstractCopyAction(JTable tagTable, IntFunction<String> keySupplier, Supplier<Collection<? extends Tagged>> objectSupplier) {
    3636        this.tagTable = Objects.requireNonNull(tagTable);
    3737        this.keySupplier = Objects.requireNonNull(keySupplier);
    3838        this.objectSupplier = Objects.requireNonNull(objectSupplier);

  • src/org/openstreetmap/josm/gui/dialogs/properties/HelpAction.java

     
    3434    /**
    3535     * Constructs a new {@code HelpAction}.
    3636     */
    37     public HelpAction() {
     37    protected HelpAction() {
    3838        putValue(SHORT_DESCRIPTION, tr("Launch browser with wiki help for selected object"));
    3939        new ImageProvider("dialogs", "search").getResource().attachImageIcon(this, true);
    4040        putValue(ACCELERATOR_KEY, getKeyStroke());

  • src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java

     
    1414/**
    1515 * This is the {@link TableCellRenderer} used in the tables of
    1616 * {@link org.openstreetmap.josm.gui.conflict.pair.relation.RelationMemberMerger}.
    17  *
     17 * @since 1790
    1818 */
    1919public abstract class MemberTableCellRenderer extends JLabel implements TableCellRenderer {
    2020    public static final Color BGCOLOR_IN_JOSM_SELECTION = new Color(235, 255, 177);
    … …  
    2424    /**
    2525     * constructor
    2626     */
    27     public MemberTableCellRenderer() {
     27    protected MemberTableCellRenderer() {
    2828        setIcon(null);
    2929        setOpaque(true);
    3030    }

  • src/org/openstreetmap/josm/gui/download/AbstractDownloadSourcePanel.java

     
    2626     * Called when creating a new {@link AbstractDownloadSourcePanel} for the given download source
    2727     * @param downloadSource The download source this panel is for
    2828     */
    29     public AbstractDownloadSourcePanel(final DownloadSource<T> downloadSource) {
     29    protected AbstractDownloadSourcePanel(final DownloadSource<T> downloadSource) {
    3030        Objects.requireNonNull(downloadSource);
    3131        this.downloadSource = downloadSource;
    3232    }

  • src/org/openstreetmap/josm/gui/download/IDownloadSourceType.java

     
    1616 * @since 16503
    1717 */
    1818public interface IDownloadSourceType {
     19
    1920    /**
     21     * Returns the checkbox to be added to the UI.
    2022     * @return The checkbox to be added to the UI
    2123     */
    2224    default JCheckBox getCheckBox() {
    … …  
    2426    }
    2527
    2628    /**
     29     * Returns the checkbox to be added to the UI.
    2730     * @param checkboxChangeListener The listener for checkboxes (may be {@code null})
    2831     * @return The checkbox to be added to the UI
    2932     */
    3033    JCheckBox getCheckBox(ChangeListener checkboxChangeListener);
    3134
    3235    /**
     36     * Returns the download task class which will be getting the data.
    3337     * @return The {@link DownloadTask} class which will be getting the data
    3438     */
    3539    Class<? extends AbstractDownloadTask<?>> getDownloadClass();
    3640
    3741    /**
     42     * Determines the last state of the download type.
    3843     * @return The boolean indicating the last state of the download type
    3944     */
    4045    default boolean isEnabled() {
    … …  
    4247    }
    4348
    4449    /**
     50     * Returns the boolean property for this particular download type.
    4551     * @return The boolean property for this particular download type
    4652     */
    4753    BooleanProperty getBooleanProperty();

  • src/org/openstreetmap/josm/gui/download/OSMDownloadSource.java

     
    131131    }
    132132
    133133    /**
     134     * Returns the possible downloads that JOSM can make in the default Download screen.
    134135     * @return The possible downloads that JOSM can make in the default Download screen
    135136     * @since 16503
    136137     */
    … …  
    151152    }
    152153
    153154    /**
     155     * Removes a download source type.
    154156     * @param type The IDownloadSourceType object to remove
    155157     * @return {@code true} if this download types contained the specified object
    156158     * @since 16503
    … …  
    359361                sizeCheck.setForeground(Color.darkGray);
    360362            }
    361363        }
    362 
    363364    }
    364365
    365366    /**
    … …  
    370371        private final List<IDownloadSourceType> downloadPossibilities;
    371372
    372373        /**
     374         * Constructs a new {@code OSMDownloadData}.
    373375         * @param downloadPossibilities A list of DataDownloadTypes (instantiated, with
    374376         *                              options set)
    375377         */
    … …  
    378380        }
    379381
    380382        /**
     383         * Returns the download possibilities.
    381384         * @return A list of DataDownloadTypes (instantiated, with options set)
    382385         */
    383386        public List<IDownloadSourceType> getDownloadPossibilities() {

  • src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

     
    6868
    6969    private static final List<HistoryHook> hooks = new ArrayList<>();
    7070
    71     protected HistoryBrowserDialogManager() {
     71    private HistoryBrowserDialogManager() {
    7272        MainApplication.getLayerManager().addLayerChangeListener(this);
    7373    }
    7474

  • src/org/openstreetmap/josm/gui/io/AbstractIOTask.java

     
    1717    /**
    1818     * Constructs a new {@code AbstractIOTask}.
    1919     */
    20     public AbstractIOTask() {
     20    protected AbstractIOTask() {
    2121        canceled = false;
    2222        failed = false;
    2323        lastException = null;

  • src/org/openstreetmap/josm/gui/io/AbstractUploadDialog.java

     
    4646     * @see java.awt.GraphicsEnvironment#isHeadless
    4747     * @see JComponent#getDefaultLocale
    4848     */
    49     public AbstractUploadDialog(Window owner, ModalityType modalityType) {
     49    protected AbstractUploadDialog(Window owner, ModalityType modalityType) {
    5050        super(owner, modalityType);
    5151    }
    5252
    … …  
    8888     * @see java.awt.GraphicsEnvironment#isHeadless
    8989     * @see JComponent#getDefaultLocale
    9090     */
    91     public AbstractUploadDialog(Window owner, String title, ModalityType modalityType, GraphicsConfiguration gc) {
     91    protected AbstractUploadDialog(Window owner, String title, ModalityType modalityType, GraphicsConfiguration gc) {
    9292        super(owner, title, modalityType, gc);
    9393    }
    9494
    … …  
    124124     * @see java.awt.GraphicsEnvironment#isHeadless
    125125     * @see JComponent#getDefaultLocale
    126126     */
    127     public AbstractUploadDialog(Window owner, String title, ModalityType modalityType) {
     127    protected AbstractUploadDialog(Window owner, String title, ModalityType modalityType) {
    128128        super(owner, title, modalityType);
    129129    }
    130130
    … …  
    151151     * @see java.awt.GraphicsEnvironment#isHeadless
    152152     * @see JComponent#getDefaultLocale
    153153     */
    154     public AbstractUploadDialog(Window owner, String title) {
     154    protected AbstractUploadDialog(Window owner, String title) {
    155155        super(owner, title);
    156156    }
    157157
    … …  
    176176     * @see java.awt.GraphicsEnvironment#isHeadless
    177177     * @see JComponent#getDefaultLocale
    178178     */
    179     public AbstractUploadDialog(Window owner) {
     179    protected AbstractUploadDialog(Window owner) {
    180180        super(owner);
    181181    }
    182182

  • src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java

     
    5252     * exception will be handled by showing a dialog. When this runnable is executed using executor framework
    5353     * then use false unless you read result of task (because exception will get lost if you don't)
    5454     */
    55     public AbstractUploadTask(String title, boolean ignoreException) {
     55    protected AbstractUploadTask(String title, boolean ignoreException) {
    5656        super(title, ignoreException);
    5757    }
    5858
    … …  
    6464     * exception will be handled by showing a dialog. When this runnable is executed using executor framework
    6565     * then use false unless you read result of task (because exception will get lost if you don't)
    6666     */
    67     public AbstractUploadTask(String title, ProgressMonitor progressMonitor, boolean ignoreException) {
     67    protected AbstractUploadTask(String title, ProgressMonitor progressMonitor, boolean ignoreException) {
    6868        super(title, progressMonitor, ignoreException);
    6969    }
    7070
    … …  
    7272     * Constructs a new {@code AbstractUploadTask}.
    7373     * @param title message for the user
    7474     */
    75     public AbstractUploadTask(String title) {
     75    protected AbstractUploadTask(String title) {
    7676        super(title);
    7777    }
    7878

  • src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java

     
    6565     * @param downloadReferrers if the referrers of the object should be downloaded as well,
    6666     *     i.e., parent relations, and for nodes, additionally, parent ways
    6767     * @param full if the members of a relation should be downloaded as well
    68      * @param newLayerName the name to use for the new layer, can be {@code null}.
     68     * @param newLayerName the name to use for the new layer, can be null.
    6969     * @param monitor ProgressMonitor to use, or null to create a new one
    7070     */
    7171    public DownloadPrimitivesWithReferrersTask(boolean newLayer, List<PrimitiveId> ids, boolean downloadReferrers,

  • src/org/openstreetmap/josm/gui/io/importexport/FileExporter.java

     
    2626     * Constructs a new {@code FileExporter}.
    2727     * @param filter The extension file filter
    2828     */
    29     public FileExporter(ExtensionFileFilter filter) {
     29    protected FileExporter(ExtensionFileFilter filter) {
    3030        this.filter = filter;
    3131        this.enabled = true;
    3232    }

  • src/org/openstreetmap/josm/gui/io/importexport/FileImporter.java

     
    4040     * Constructs a new {@code FileImporter} with the given extension file filter.
    4141     * @param filter The extension file filter
    4242     */
    43     public FileImporter(ExtensionFileFilter filter) {
     43    protected FileImporter(ExtensionFileFilter filter) {
    4444        this.filter = filter;
    4545        this.enabled = true;
    4646    }

  • src/org/openstreetmap/josm/gui/layer/AbstractCachedTileSourceLayer.java

     
    4444     *
    4545     * @param info ImageryInfo describing the layer
    4646     */
    47     public AbstractCachedTileSourceLayer(ImageryInfo info) {
     47    protected AbstractCachedTileSourceLayer(ImageryInfo info) {
    4848        super(info);
    4949
    5050        if (loaderFactoryOverride != null) {
    … …  
    111111    }
    112112
    113113    /**
     114     * Returns cache configured object for specified cache region.
    114115     * @param name of cache region
    115116     * @return cache configured object for specified cache region
    116117     */

  • src/org/openstreetmap/josm/gui/layer/AbstractModifiableLayer.java

     
    1616     * Constructs a new {@code ModifiableLayer}.
    1717     * @param name Layer name
    1818     */
    19     public AbstractModifiableLayer(String name) {
     19    protected AbstractModifiableLayer(String name) {
    2020        super(name);
    2121    }
    2222

  • src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

     
    214214     * Creates Tile Source based Imagery Layer based on Imagery Info
    215215     * @param info imagery info
    216216     */
    217     public AbstractTileSourceLayer(ImageryInfo info) {
     217    protected AbstractTileSourceLayer(ImageryInfo info) {
    218218        super(info);
    219219        setBackgroundLayer(true);
    220220        this.setVisible(true);
    … …  
    708708    }
    709709
    710710    /**
     711     * Returns maximum max zoom level, that will be shown on layer.
    711712     * @param ts TileSource for which we want to know maximum zoom level
    712713     * @return maximum max zoom level, that will be shown on layer
    713714     */
    … …  
    716717    }
    717718
    718719    /**
     720     * Returns minimum zoom level, that will be shown on layer.
    719721     * @param ts TileSource for which we want to know minimum zoom level
    720722     * @return minimum zoom level, that will be shown on layer
    721723     */
    … …  
    773775    }
    774776
    775777    /**
    776      *
    777      * @return if its allowed to zoom in
     778     * Determines if it is allowed to zoom in.
     779     * @return if it is allowed to zoom in
    778780     */
    779781    public boolean zoomIncreaseAllowed() {
    780782        boolean zia = currentZoomLevel < this.getMaxZoomLvl();
    … …  
    18211823        }
    18221824
    18231825        /**
     1826         * Determines if the task is finished.
    18241827         * @return true, if all is done
    18251828         */
    18261829        public boolean isFinished() {
    … …  
    18281831        }
    18291832
    18301833        /**
     1834         * Returns total number of tiles to download.
    18311835         * @return total number of tiles to download
    18321836         */
    18331837        public int getTotalCount() {
    … …  
    18591863        }
    18601864
    18611865        /**
     1866         * Returns tile loader that is used to load the tiles.
    18621867         * @return tile loader that is used to load the tiles
    18631868         */
    18641869        public TileLoader getTileLoader() {

  • src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java

     
    8383    }
    8484
    8585    /**
     86     * Adds a nag panel for a given imagery info.
    8687     * @param infoToAdd ImageryInfo for which the nag panel should be created
    8788     */
    8889    public static void addNagPanelIfNeeded(ImageryInfo infoToAdd) {

  • src/org/openstreetmap/josm/gui/layer/GpxLayer.java

     
    371371    }
    372372
    373373    /**
     374     * Returns the linked MarkerLayer.
    374375     * @return the linked MarkerLayer (imported from the same file)
    375376     * @since 15496
    376377     */
    … …  
    379380    }
    380381
    381382    /**
     383     * Sets the linked MarkerLayer.
    382384     * @param linkedMarkerLayer the linked MarkerLayer
    383385     * @since 15496
    384386     */

  • src/org/openstreetmap/josm/gui/layer/ImageryLayer.java

     
    6868     * Constructs a new {@code ImageryLayer}.
    6969     * @param info imagery info
    7070     */
    71     public ImageryLayer(ImageryInfo info) {
     71    protected ImageryLayer(ImageryInfo info) {
    7272        super(info.getName());
    7373        this.info = info;
    7474        if (info.getIcon() != null) {

  • src/org/openstreetmap/josm/gui/layer/Layer.java

     
    167167     * Create the layer and fill in the necessary components.
    168168     * @param name Layer name
    169169     */
    170     public Layer(String name) {
     170    protected Layer(String name) {
    171171        this.propertyChangeSupport = new PropertyChangeSupport(this);
    172172        setName(name);
    173173    }
    … …  
    194194    public abstract Icon getIcon();
    195195
    196196    /**
     197     * Determines whether the layer has / can handle colors.
    197198     * @return whether the layer has / can handle colors.
    198199     * @since 15496
    199200     */
    … …  
    219220    }
    220221
    221222    /**
     223     * Returns a small tooltip hint about some statistics for this layer.
    222224     * @return A small tooltip hint about some statistics for this layer.
    223225     */
    224226    public abstract String getToolTipText();
    … …  
    233235    public abstract void mergeFrom(Layer from);
    234236
    235237    /**
     238     * Determines if the other layer can be merged into this layer.
    236239     * @param other The other layer that is tested to be mergable with this.
    237240     * @return Whether the other layer can be merged into this layer.
    238241     */

  • src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java

     
    122122        }
    123123
    124124        /**
    125          * @return true if this {@link MapViewPaintable} is used as a temporary layer.
     125         * Determines if this {@link MapViewPaintable} is used as a temporary layer
     126         * @return true if this {@code MapViewPaintable} is used as a temporary layer.
    126127         */
    127128        public boolean isTemporaryLayer() {
    128129            return temporaryLayer;

  • src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

     
    843843    }
    844844
    845845    /**
     846     * Converts a node to a waypoint.
    846847     * @param n the {@code Node} to convert
    847848     * @return {@code WayPoint} object
    848849     * @since 13210
    … …  
    852853    }
    853854
    854855    /**
     856     * Converts a node to a waypoint.
    855857     * @param n the {@code Node} to convert
    856858     * @param time a timestamp value in milliseconds from the epoch.
    857859     * @return {@code WayPoint} object

  • src/org/openstreetmap/josm/gui/layer/TMSLayer.java

     
    139139    }
    140140
    141141    /**
     142     * Returns cache for TMS region.
    142143     * @return cache for TMS region
    143144     */
    144145    public static CacheAccess<String, BufferedImageCacheEntry> getCache() {

  • src/org/openstreetmap/josm/gui/layer/WMSLayer.java

     
    195195    }
    196196
    197197    /**
     198     * Returns cache region for WMS layer.
    198199     * @return cache region for WMS layer
    199200     */
    200201    public static CacheAccess<String, BufferedImageCacheEntry> getCache() {

  • src/org/openstreetmap/josm/gui/layer/WMTSLayer.java

     
    114114    }
    115115
    116116    /**
     117     * Returns cache region for WMTS layer.
    117118     * @return cache region for WMTS layer
    118119     */
    119120    public static CacheAccess<String, BufferedImageCacheEntry> getCache() {

  • src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java

     
    3636    private final String prefDateMax;
    3737
    3838    /**
    39      * Create the panel to filter tracks on GPX layer @param layer by date
    40      * Preferences will be stored in @param preferencePrefix
    41      * If @param enabled = true, then the panel is created as active and filtering occurs immediately.
     39     * Create the panel to filter tracks on GPX layer {@code layer} by date
     40     * Preferences will be stored in {@code preferencePrefix}
     41     * If {@code enabled = true}, then the panel is created as active and filtering occurs immediately.
    4242     * @param layer GPX layer
    4343     * @param preferencePrefix preference prefix
    4444     * @param enabled panel initial enabled state

  • src/org/openstreetmap/josm/gui/layer/imagery/TilePosition.java

     
    3333    }
    3434
    3535    /**
     36     * Returns the x position.
    3637     * @return the x position
    3738     */
    3839    public int getX() {
    … …  
    4041    }
    4142
    4243    /**
     44     * Returns the y position.
    4345     * @return the y position
    4446     */
    4547    public int getY() {
    … …  
    4749    }
    4850
    4951    /**
     52     * Returns the zoom.
    5053     * @return the zoom
    5154     */
    5255    public int getZoom() {

  • src/org/openstreetmap/josm/gui/layer/imagery/WMTSLayerSelection.java

     
    132132    }
    133133
    134134    /**
     135     * Returns selected layer.
    135136     * @return selected layer
    136137     */
    137138    public Layer getSelectedLayer() {

  • src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

     
    146146    }
    147147
    148148    /**
    149      * Image provider for icon. Note that this is a provider only. A @link{ImageProvider#get()} call may still fail!
     149     * Image provider for icon. Note that this is a provider only. A {@link ImageProvider#get()} call may still fail!
    150150     *
    151151     * @param ref reference to the requested icon
    152152     * @param test if <code>true</code> than the icon is request is tested

  • src/org/openstreetmap/josm/gui/mappaint/StyleSource.java

     
    7777     * @param name The name for this StyleSource
    7878     * @param title The title that can be used as menu entry
    7979     */
    80     public StyleSource(String url, String name, String title) {
     80    protected StyleSource(String url, String name, String title) {
    8181        super(SourceType.MAP_PAINT_STYLE, url, name, title, true);
    8282    }
    8383
    … …  
    8585     * Constructs a new {@link StyleSource}
    8686     * @param entry The entry to copy the data (url, name, ...) from.
    8787     */
    88     public StyleSource(SourceEntry entry) {
     88    protected StyleSource(SourceEntry entry) {
    8989        super(entry);
    9090    }
    9191

  • src/org/openstreetmap/josm/gui/mappaint/mapcss/Functions.java

     
    658658     * Function associated to the logical "&gt;=" operator.
    659659     * @param a first value
    660660     * @param b second value
    661      * @return {@code true} if {@code a &gt;= b}
     661     * @return {@code true} if {@code a >= b}
    662662     */
    663663    public static boolean greater_equal(float a, float b) { // NO_UCD (unused code)
    664664        return a >= b;
    … …  
    668668     * Function associated to the logical "&lt;=" operator.
    669669     * @param a first value
    670670     * @param b second value
    671      * @return {@code true} if {@code a &lt;= b}
     671     * @return {@code true} if {@code a <= b}
    672672     */
    673673    public static boolean less_equal(float a, float b) { // NO_UCD (unused code)
    674674        return a <= b;
    … …  
    678678     * Function associated to the logical "&gt;" operator.
    679679     * @param a first value
    680680     * @param b second value
    681      * @return {@code true} if {@code a &gt; b}
     681     * @return {@code true} if {@code a > b}
    682682     */
    683683    public static boolean greater(float a, float b) { // NO_UCD (unused code)
    684684        return a > b;
    … …  
    688688     * Function associated to the logical "&lt;" operator.
    689689     * @param a first value
    690690     * @param b second value
    691      * @return {@code true} if {@code a &lt; b}
     691     * @return {@code true} if {@code a < b}
    692692     */
    693693    public static boolean less(float a, float b) { // NO_UCD (unused code)
    694694        return a < b;

  • src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java

     
    6464     * @param defaultSelectedHandling true if default behavior for selected objects
    6565     * is enabled, false if a style for selected state is given explicitly
    6666     */
    67     public StyleElement(float majorZIndex, float zIndex, float objectZIndex, boolean isModifier, boolean defaultSelectedHandling) {
     67    protected StyleElement(float majorZIndex, float zIndex, float objectZIndex, boolean isModifier, boolean defaultSelectedHandling) {
    6868        this.majorZIndex = majorZIndex;
    6969        this.zIndex = zIndex;
    7070        this.objectZIndex = objectZIndex;

  • src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java

     
    2727     * Constructs a new {@code AbstractAuthorizationUI} without API URL.
    2828     * @since 10189
    2929     */
    30     public AbstractAuthorizationUI() {
     30    protected AbstractAuthorizationUI() {
    3131    }
    3232
    3333    /**
    … …  
    3535     * @param apiUrl The OSM API URL
    3636     * @since 5422
    3737     */
    38     public AbstractAuthorizationUI(String apiUrl) {
     38    protected AbstractAuthorizationUI(String apiUrl) {
    3939        setApiUrl(apiUrl);
    4040    }
    4141

  • src/org/openstreetmap/josm/gui/preferences/DefaultPreferenceSetting.java

     
    2323     *
    2424     * (Not an expert option by default.)
    2525     */
    26     public DefaultPreferenceSetting() {
     26    protected DefaultPreferenceSetting() {
    2727        this(false);
    2828    }
    2929
    … …  
    3232     *
    3333     * @param isExpert true, if it is an expert option
    3434     */
    35     public DefaultPreferenceSetting(boolean isExpert) {
     35    protected DefaultPreferenceSetting(boolean isExpert) {
    3636        this.isExpert = isExpert;
    3737    }
    3838

  • src/org/openstreetmap/josm/gui/preferences/DefaultTabPreferenceSetting.java

     
    2929    /**
    3030     * Constructs a new {@code DefaultTabPreferenceSetting}.
    3131     */
    32     public DefaultTabPreferenceSetting() {
     32    protected DefaultTabPreferenceSetting() {
    3333        this(null, null, null);
    3434    }
    3535
    36     public DefaultTabPreferenceSetting(String iconName, String title, String description) {
     36    protected DefaultTabPreferenceSetting(String iconName, String title, String description) {
    3737        this(iconName, title, description, false);
    3838    }
    3939
    40     public DefaultTabPreferenceSetting(String iconName, String title, String description, boolean isExpert) {
     40    protected DefaultTabPreferenceSetting(String iconName, String title, String description, boolean isExpert) {
    4141        this(iconName, title, description, isExpert, null);
    4242    }
    4343
    44     public DefaultTabPreferenceSetting(String iconName, String title, String description, boolean isExpert, JTabbedPane tabpane) {
     44    protected DefaultTabPreferenceSetting(String iconName, String title, String description, boolean isExpert, JTabbedPane tabpane) {
    4545        super(isExpert);
    4646        this.iconName = iconName;
    4747        this.description = description;

  • src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

     
    193193    @FunctionalInterface
    194194    public interface ValidationListener {
    195195        /**
    196          *
     196         * Determines if preferences can be saved.
    197197         * @return True if preferences can be saved
    198198         */
    199199        boolean validatePreferences();

  • src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

     
    145145     * @param sourceProviders the list of additional source providers, from plugins
    146146     * @param handleIcons {@code true} if icons may be managed, {@code false} otherwise
    147147     */
    148     public SourceEditor(SourceType sourceType, String availableSourcesUrl, List<SourceProvider> sourceProviders, boolean handleIcons) {
     148    protected SourceEditor(SourceType sourceType, String availableSourcesUrl, List<SourceProvider> sourceProviders, boolean handleIcons) {
    149149
    150150        this.sourceType = sourceType;
    151151        this.canEnable = sourceType == SourceType.MAP_PAINT_STYLE || sourceType == SourceType.TAGCHECKER_RULE;

  • src/org/openstreetmap/josm/gui/preferences/advanced/AbstractListEditor.java

     
    2727     * @param title        The text that will be shown in the window titlebar
    2828     * @param entry        Preference entry
    2929     */
    30     public AbstractListEditor(Component parent, String title, PrefEntry entry) {
     30    protected AbstractListEditor(Component parent, String title, PrefEntry entry) {
    3131        super(parent, title, tr("OK"), tr("Cancel"));
    3232        this.entry = entry;
    3333        setButtonIcons("ok", "cancel");

  • src/org/openstreetmap/josm/gui/preferences/advanced/AbstractTableListEditor.java

     
    4747     * @param title        The text that will be shown in the window titlebar
    4848     * @param entry        Preference entry
    4949     */
    50     public AbstractTableListEditor(Component parent, String title, PrefEntry entry) {
     50    protected AbstractTableListEditor(Component parent, String title, PrefEntry entry) {
    5151        super(parent, title, entry);
    5252        entryModel = newEntryListModel();
    5353        entryList = new JList<>(entryModel);

  • src/org/openstreetmap/josm/gui/preferences/imagery/HeadersTable.java

     
    110110    }
    111111
    112112    /**
     113     * Returns headers provided by user.
    113114     * @return headers provided by user
    114115     */
    115116    public Map<String, String> getHeaders() {

  • src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java

     
    2323     * @param name short name of the projection choice as shown in the GUI
    2424     * @param id unique identifier for the projection choice
    2525     */
    26     public AbstractProjectionChoice(String name, String id) {
     26    protected AbstractProjectionChoice(String name, String id) {
    2727        this.name = name;
    2828        this.id = id;
    2929    }

  • src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java

     
    3232     * @param label a label shown left to the combo-box
    3333     * @param defaultIndex the default index for the combo-box
    3434     */
    35     public ListProjectionChoice(String name, String id, String[] entries, String label, int defaultIndex) {
     35    protected ListProjectionChoice(String name, String id, String[] entries, String label, int defaultIndex) {
    3636        super(name, id);
    3737        this.entries = Utils.copyArray(entries);
    3838        this.label = label;
    … …  
    4646     * @param entries the list of display entries for the combo-box
    4747     * @param label a label shown left to the combo-box
    4848     */
    49     public ListProjectionChoice(String name, String id, String[] entries, String label) {
     49    protected ListProjectionChoice(String name, String id, String[] entries, String label) {
    5050        this(name, id, entries, label, 0);
    5151    }
    5252

  • src/org/openstreetmap/josm/gui/preferences/projection/SubPrefsOptions.java

     
    22package org.openstreetmap.josm.gui.preferences.projection;
    33
    44/**
    5  * ProjectionChoice can implement this interface to set some additional options
     5 * ProjectionChoice can implement this interface to set some additional options.
     6 * @since 5226
    67 */
    78public interface SubPrefsOptions {
    89
    910    /**
     11     * Determines if the projection code should be displayed in the top panel.
    1012     * @return true, if the projection code should be displayed in the top panel
    1113     */
    1214    boolean showProjectionCode();
    1315
    1416    /**
     17     * Determines if the projection name should be displayed in the top panel.
    1518     * @return true, if the projection name should be displayed in the top panel
    1619     */
    1720    boolean showProjectionName();

  • src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java

     
    7171    }
    7272
    7373    /**
     74     * Returns the current filter expression.
    7475     * @return the current filter expression; null, if no filter expression is set
    7576     */
    7677    public String getFilter() {

  • src/org/openstreetmap/josm/gui/widgets/AbstractIdTextField.java

     
    2020     * Constructs a new {@link AbstractIdTextField}
    2121     * @param klass The validator class
    2222     */
    23     public AbstractIdTextField(Class<T> klass) {
     23    protected AbstractIdTextField(Class<T> klass) {
    2424        this(klass, 0);
    2525    }
    2626
    … …  
    3030     * @param columns The number of columns to use to calculate the preferred width
    3131     * @see JosmTextField#JosmTextField(int)
    3232     */
    33     public AbstractIdTextField(Class<T> klass, int columns) {
     33    protected AbstractIdTextField(Class<T> klass, int columns) {
    3434        super(columns);
    3535        T validator = null;
    3636        try {

  • src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java

     
    8484     * @param tc the text component. Must not be null.
    8585     * @throws IllegalArgumentException if tc is null
    8686     */
    87     public AbstractTextComponentValidator(JTextComponent tc) {
     87    protected AbstractTextComponentValidator(JTextComponent tc) {
    8888        this(tc, true);
    8989    }
    9090
    … …  
    9494     * @param tc text component
    9595     * @param addActionListener {@code true} to add the action listener
    9696     */
    97     public AbstractTextComponentValidator(JTextComponent tc, boolean addActionListener) {
     97    protected AbstractTextComponentValidator(JTextComponent tc, boolean addActionListener) {
    9898        this(tc, true, true, addActionListener);
    9999    }
    100100
    … …  
    105105     * @param addDocumentListener {@code true} to add the document listener
    106106     * @param addActionListener {@code true} to add the action listener
    107107     */
    108     public AbstractTextComponentValidator(JTextComponent tc, boolean addFocusListener, boolean addDocumentListener, boolean addActionListener) {
     108    protected AbstractTextComponentValidator(
     109            JTextComponent tc, boolean addFocusListener, boolean addDocumentListener, boolean addActionListener) {
    109110        CheckParameterUtil.ensureParameterNotNull(tc, "tc");
    110111        this.tc = tc;
    111112        if (addFocusListener) {

  • src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java

     
    189189    }
    190190
    191191    /**
     192     * Returns the value of the floatingDividers property.
    192193     * @return the value of the floatingDividers property
    193194     * @see #setFloatingDividers
    194195     */
    … …  
    714715        }
    715716
    716717        /**
     718         * Returns the invalid Node.
    717719         * @return the invalid Node.
    718720         */
    719721        public Node getNode() {

  • src/org/openstreetmap/josm/gui/widgets/OsmPrimitivesTable.java

     
    3535     * @param cm column model
    3636     * @param sm selection model
    3737     */
    38     public OsmPrimitivesTable(OsmPrimitivesTableModel dm, TableColumnModel cm, ListSelectionModel sm) {
     38    protected OsmPrimitivesTable(OsmPrimitivesTableModel dm, TableColumnModel cm, ListSelectionModel sm) {
    3939        super(dm, cm, sm);
    4040        addMouseListener(new PopupMenuLauncher(getPopUpMenu()));
    4141        addMouseListener(new DblClickHandler());

  • src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java

     
    148148    }
    149149
    150150    /**
     151     * Returns the popup menu.
    151152     * @return the popup menu if defined, {@code null} otherwise.
    152153     * @since 5884
    153154     */

  • src/org/openstreetmap/josm/gui/widgets/SearchTextResultListPanel.java

     
    3939    /**
    4040     * Constructs a new {@code SearchTextResultListPanel}.
    4141     */
    42     public SearchTextResultListPanel() {
     42    protected SearchTextResultListPanel() {
    4343        super(new BorderLayout());
    4444
    4545        edSearchText = new JosmTextField();

  • src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

     
    255255    }
    256256
    257257    /**
     258     * Determines if download is complete for the given bounding box.
    258259     * @return true if download is complete for the given bounding box (not filtered)
    259260     */
    260261    public boolean considerAsFullDownload() {

  • src/org/openstreetmap/josm/io/CacheCustomContent.java

     
    7272     * @param ident ident that identifies the stored file. Includes file-ending.
    7373     * @param updateInterval update interval in seconds. -1 means always
    7474     */
    75     public CacheCustomContent(String ident, int updateInterval) {
     75    protected CacheCustomContent(String ident, int updateInterval) {
    7676        this.ident = ident;
    7777        this.updateInterval = updateInterval;
    7878        this.path = new File(Config.getDirs().getCacheDirectory(true), ident);

  • src/org/openstreetmap/josm/io/OsmServerLocationReader.java

     
    4646        protected final Compression compression;
    4747        protected InputStream in;
    4848
    49         public Parser(ProgressMonitor progressMonitor, Compression compression) {
     49        protected Parser(ProgressMonitor progressMonitor, Compression compression) {
    5050            this.progressMonitor = progressMonitor;
    5151            this.compression = compression;
    5252        }

  • src/org/openstreetmap/josm/io/OsmServerReader.java

     
    4646    /**
    4747     * Constructs a new {@code OsmServerReader}.
    4848     */
    49     public OsmServerReader() {
     49    protected OsmServerReader() {
    5050        try {
    5151            doAuthenticate = OsmApi.isUsingOAuth()
    5252                    && CredentialsManager.getInstance().lookupOAuthAccessToken() != null

  • src/org/openstreetmap/josm/io/imagery/WMSImagery.java

     
    244244    }
    245245
    246246    /**
     247     * Returns root URL of services in this GetCapabilities.
    247248     * @return root URL of services in this GetCapabilities
    248249     */
    249250    public String buildRootUrl() {
    … …  
    271272    }
    272273
    273274    /**
     275     * Returns root URL of services without the GetCapabilities call.
    274276     * @return root URL of services without the GetCapabilities call
    275277     * @since 15209
    276278     */
    … …  
    303305    }
    304306
    305307    /**
     308     * Returns URL for accessing GetMap service. String will contain following parameters:
     309     * * {proj} - that needs to be replaced with projection (one of {@link #getServerProjections(List)})
     310     * * {width} - that needs to be replaced with width of the tile
     311     * * {height} - that needs to be replaces with height of the tile
     312     * * {bbox} - that needs to be replaced with area that should be fetched (in {proj} coordinates)
     313     *
     314     * Format of the response will be calculated using {@link #getPreferredFormat()}
     315     *
    306316     * @param selectedLayers selected layers as subset of the tree returned by {@link #getLayers()}
    307317     * @param selectedStyles selected styles for all selectedLayers
    308318     * @param transparent whether returned images should contain transparent pixels (if supported by format)
    … …  
    314324    }
    315325
    316326    /**
     327     * Returns URL for accessing GetMap service. String will contain following parameters:
     328     * * {proj} - that needs to be replaced with projection (one of {@link #getServerProjections(List)})
     329     * * {width} - that needs to be replaced with width of the tile
     330     * * {height} - that needs to be replaces with height of the tile
     331     * * {bbox} - that needs to be replaced with area that should be fetched (in {proj} coordinates)
     332     *
    317333     * @param selectedLayers selected layers as subset of the tree returned by {@link #getLayers()}
    318334     * @param selectedStyles selected styles for all selectedLayers
    319335     * @param format format of the response - one of {@link #getFormats()}
    … …  
    331347    }
    332348
    333349    /**
     350     * Returns URL for accessing GetMap service. String will contain following parameters:
     351     * * {proj} - that needs to be replaced with projection (one of {@link #getServerProjections(List)})
     352     * * {width} - that needs to be replaced with width of the tile
     353     * * {height} - that needs to be replaces with height of the tile
     354     * * {bbox} - that needs to be replaced with area that should be fetched (in {proj} coordinates)
     355     *
    334356     * @param selectedLayers selected layers as list of strings
    335357     * @param selectedStyles selected styles of layers as list of strings
    336358     * @param format format of the response - one of {@link #getFormats()}
    … …  
    523545    }
    524546
    525547    /**
     548     * Determines if this service operates at protocol level below WMS 1.3.0
    526549     * @return if this service operates at protocol level below 1.3.0
    527550     */
    528551    public boolean belowWMS130() {
    … …  
    708731    }
    709732
    710733    /**
     734     * Returns collection of LayerDetails specified by defaultLayers.
    711735     * @param defaultLayers default layers that should select layer object
    712      * @return collection of LayerDetails specified by DefaultLayers
     736     * @return collection of LayerDetails specified by defaultLayers
    713737     */
    714738    public List<LayerDetails> getLayers(List<DefaultLayer> defaultLayers) {
    715739        Collection<String> layerNames = defaultLayers.stream().map(DefaultLayer::getLayerName).collect(Collectors.toList());
    … …  
    720744    }
    721745
    722746    /**
     747     * Returns title of this service.
    723748     * @return title of this service
    724749     */
    725750    public String getTitle() {

  • src/org/openstreetmap/josm/io/session/SessionReader.java

     
    199199    }
    200200
    201201    /**
     202     * Returns list of layers that are later added to the mapview.
    202203     * @return list of layers that are later added to the mapview
    203204     */
    204205    public List<Layer> getLayers() {
    … …  
    206207    }
    207208
    208209    /**
     210     * Returns active layer.
    209211     * @return active layer, or {@code null} if not set
    210212     * @since 6271
    211213     */
    … …  
    215217    }
    216218
    217219    /**
     220     * Returns actions executed in EDT after layers have been added.
    218221     * @return actions executed in EDT after layers have been added (message dialog, etc.)
    219222     */
    220223    public List<Runnable> getPostLoadTasks() {
    … …  
    222225    }
    223226
    224227    /**
    225      * Return the viewport (map position and scale).
     228     * Returns the viewport (map position and scale).
    226229     * @return the viewport; can be null when no viewport info is found in the file
    227230     */
    228231    public SessionViewportData getViewport() {
    … …  
    230233    }
    231234
    232235    /**
    233      * Return the projection choice data.
     236     * Returns the projection choice data.
    234237     * @return the projection; can be null when no projection info is found in the file
    235238     */
    236239    public SessionProjectionChoiceData getProjectionChoice() {

  • src/org/openstreetmap/josm/plugins/Plugin.java

     
    101101     *
    102102     * @param info the plugin information describing the plugin.
    103103     */
    104     public Plugin(PluginInformation info) {
     104    protected Plugin(PluginInformation info) {
    105105        this.info = info;
    106106    }
    107107

  • src/org/openstreetmap/josm/spi/preferences/AbstractSetting.java

     
    1313    protected final T value;
    1414    protected Long time;
    1515    protected boolean isNew;
     16
    1617    /**
    1718     * Constructs a new {@code AbstractSetting} with the given value
    1819     * @param value The setting value
    1920     */
    20     public AbstractSetting(T value) {
     21    protected AbstractSetting(T value) {
    2122        this.value = value;
    2223        this.time = null;
    2324        this.isNew = false;

  • src/org/openstreetmap/josm/tools/HttpClient.java

     
    511511        public abstract Map<String, List<String>> getHeaderFields();
    512512
    513513        /**
     514         * Indicates that other requests to the server are unlikely in the near future.
    514515         * @see HttpURLConnection#disconnect()
    515516         */
    516517        public abstract void disconnect();

  • src/org/openstreetmap/josm/tools/WindowsShortcut.java

     
    6767    }
    6868
    6969    /**
     70     * Returns the name of the filesystem object pointed to by this shortcut.
    7071     * @return the name of the filesystem object pointed to by this shortcut
    7172     */
    7273    public String getRealFilename() {

  • tools

  • tools/ivy.xml 

    Property changes on: tools
___________________________________________________________________
Modified: svn:ignore
## -1,2 +1,3 ##
 ivy-report
 jacocoant.jar
+error_prone
     
    88        <conf name="proguard" description="Everything needed for running ProGuard"/>
    99        <conf name="pmd" description="Everything needed for running PMD"/>
    1010        <conf name="spotbugs" description="Everything needed for running SpotBugs"/>
     11        <conf name="errorprone" description="Everything needed for running error-prone"/>
    1112    </configurations>
    1213    <dependencies>
    1314        <!-- javacc->default -->
    … …  
    2627        <!-- spotbugs->default -->
    2728        <dependency org="com.github.spotbugs" name="spotbugs" rev="4.0.1" conf="spotbugs->default"/>
    2829        <dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.0.1" conf="spotbugs->default"/>
     30        <!-- errorprone->default -->
     31        <dependency org="com.google.errorprone" name="error_prone_core" rev="2.4.0" conf="errorprone->default"/>
    2932    </dependencies>
    3033</ivy-module>