From 06b7eb1d2c0499330f495125708ea20d17ca788f Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Mon, 30 Jun 2008 10:46:41 +0200 Subject: [PATCH] fix parameter assignments add annotations to suppress some warnings that can be ignored --- src/de/todesbaum/jsite/application/FileOption.java | 54 ++++++------ src/de/todesbaum/jsite/application/Project.java | 99 +++++++++++----------- .../jsite/application/ProjectInserter.java | 2 + 3 files changed, 80 insertions(+), 75 deletions(-) diff --git a/src/de/todesbaum/jsite/application/FileOption.java b/src/de/todesbaum/jsite/application/FileOption.java index c1d201a..6b979a6 100644 --- a/src/de/todesbaum/jsite/application/FileOption.java +++ b/src/de/todesbaum/jsite/application/FileOption.java @@ -1,20 +1,20 @@ /* - * jSite - a tool for uploading websites into Freenet - * Copyright (C) 2006 David Roden + * jSite - a tool for uploading websites into Freenet Copyright (C) 2006 David + * Roden * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place - Suite 330, Boston, MA 02111-1307, USA. */ package de.todesbaum.jsite.application; @@ -97,9 +97,10 @@ public class FileOption { */ public void setCustomKey(String customKey) { if (customKey == null) { - customKey = ""; + this.customKey = ""; + } else { + this.customKey = customKey; } - this.customKey = customKey; } /** @@ -135,9 +136,10 @@ public class FileOption { */ public void setMimeType(String mimeType) { if (mimeType == null) { - mimeType = defaultMimeType; + this.mimeType = defaultMimeType; + } else { + this.mimeType = mimeType; } - this.mimeType = mimeType; } /** @@ -167,28 +169,28 @@ public class FileOption { */ public void setContainer(String container) { if (container == null) { - container = DEFAULT_CONTAINER; + this.container = DEFAULT_CONTAINER; + } else { + this.container = container; } - this.container = container; } /** * Sets whether the file should have “$[EDITION+n]” tags replaced. * * @param replaceEdition - * true to replace tags, false not - * to replace + * true to replace tags, false not to + * replace */ public void setReplaceEdition(boolean replaceEdition) { this.replaceEdition = replaceEdition; } /** - * Returns whether the file should have “$[EDITION+n]” tags - * replaced. + * Returns whether the file should have “$[EDITION+n]” tags replaced. * - * @return true if tags should be replaced, - * false otherwise + * @return true if tags should be replaced, false + * otherwise */ public boolean getReplaceEdition() { return replaceEdition; @@ -242,4 +244,4 @@ public class FileOption { return false; } -} \ No newline at end of file +} diff --git a/src/de/todesbaum/jsite/application/Project.java b/src/de/todesbaum/jsite/application/Project.java index 7b4dc00..3768d06 100644 --- a/src/de/todesbaum/jsite/application/Project.java +++ b/src/de/todesbaum/jsite/application/Project.java @@ -1,20 +1,20 @@ /* - * jSite - a tool for uploading websites into Freenet - * Copyright (C) 2006 David Roden + * jSite - a tool for uploading websites into Freenet Copyright (C) 2006 David + * Roden * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place - Suite 330, Boston, MA 02111-1307, USA. */ package de.todesbaum.jsite.application; @@ -28,7 +28,7 @@ import de.todesbaum.util.mime.DefaultMIMETypes; /** * Container for project information. - * + * * @author David ‘Bombe’ Roden <bombe@freenetproject.org> */ public class Project implements Comparable { @@ -72,7 +72,7 @@ public class Project implements Comparable { /** * Creates a new project from an existing one. - * + * * @param project * The project to clone */ @@ -91,7 +91,7 @@ public class Project implements Comparable { /** * Returns the name of the project. - * + * * @return The name of the project */ public String getName() { @@ -100,7 +100,7 @@ public class Project implements Comparable { /** * Sets the name of the project. - * + * * @param name * The name of the project */ @@ -110,7 +110,7 @@ public class Project implements Comparable { /** * Returns the description of the project. - * + * * @return The description of the project */ public String getDescription() { @@ -119,7 +119,7 @@ public class Project implements Comparable { /** * Sets the description of the project. - * + * * @param description * The description of the project */ @@ -129,7 +129,7 @@ public class Project implements Comparable { /** * Returns the local path of the project. - * + * * @return The local path of the project */ public String getLocalPath() { @@ -138,7 +138,7 @@ public class Project implements Comparable { /** * Sets the local path of the project. - * + * * @param localPath * The local path of the project */ @@ -149,7 +149,7 @@ public class Project implements Comparable { /** * Returns the name of the index file of the project, relative to the * project’s local path. - * + * * @return The name of the index file of the project */ public String getIndexFile() { @@ -159,7 +159,7 @@ public class Project implements Comparable { /** * Sets the name of the index file of the project, relative to the project’s * local path. - * + * * @param indexFile * The name of the index file of the project */ @@ -170,7 +170,7 @@ public class Project implements Comparable { /** * Returns the time the project was last inserted, in milliseconds since the * epoch. - * + * * @return The time of the last insertion */ public long getLastInsertionTime() { @@ -180,7 +180,7 @@ public class Project implements Comparable { /** * Sets the time the project was last inserted, in milliseconds since the * last epoch. - * + * * @param lastInserted * The time of the last insertion */ @@ -191,7 +191,7 @@ public class Project implements Comparable { /** * Returns the remote path of the project. The remote path is the path that * directly follows the request URI of the project. - * + * * @return The remote path of the project */ public String getPath() { @@ -201,7 +201,7 @@ public class Project implements Comparable { /** * Sets the remote path of the project. The remote path is the path that * directly follows the request URI of the project. - * + * * @param path * The remote path of the project */ @@ -211,7 +211,7 @@ public class Project implements Comparable { /** * Returns the insert URI of the project. - * + * * @return The insert URI of the project */ public String getInsertURI() { @@ -220,7 +220,7 @@ public class Project implements Comparable { /** * Sets the insert URI of the project. - * + * * @param insertURI * The insert URI of the project */ @@ -230,7 +230,7 @@ public class Project implements Comparable { /** * Returns the request URI of the project. - * + * * @return The request URI of the project */ public String getRequestURI() { @@ -239,7 +239,7 @@ public class Project implements Comparable { /** * Sets the request URI of the project. - * + * * @param requestURI * The request URI of the project */ @@ -259,31 +259,32 @@ public class Project implements Comparable { /** * Shortens the given URI by removing scheme and key-type prefixes. - * + * * @param uri * The URI to shorten * @return The shortened URI */ private String shortenURI(String uri) { - if (uri.startsWith("freenet:")) { - uri = uri.substring("freenet:".length()); + String shortUri = uri; + if (shortUri.startsWith("freenet:")) { + shortUri = shortUri.substring("freenet:".length()); } - if (uri.startsWith("SSK@")) { - uri = uri.substring("SSK@".length()); + if (shortUri.startsWith("SSK@")) { + shortUri = shortUri.substring("SSK@".length()); } - if (uri.startsWith("USK@")) { - uri = uri.substring("USK@".length()); + if (shortUri.startsWith("USK@")) { + shortUri = shortUri.substring("USK@".length()); } - if (uri.endsWith("/")) { - uri = uri.substring(0, uri.length() - 1); + if (shortUri.endsWith("/")) { + shortUri = shortUri.substring(0, shortUri.length() - 1); } - return uri; + return shortUri; } /** * Shortens the name of the given file by removing the local path of the * project and leading file separators. - * + * * @param file * The file whose name should be shortened * @return The shortened name of the file @@ -303,7 +304,7 @@ public class Project implements Comparable { * Returns the options for the file with the given name. If the file does * not yet have any options, a new set of default options is created and * returned. - * + * * @param filename * The name of the file, relative to the project root * @return The options for the file @@ -319,7 +320,7 @@ public class Project implements Comparable { /** * Sets options for a file. - * + * * @param filename * The filename to set the options for, relative to the project * root @@ -337,7 +338,7 @@ public class Project implements Comparable { /** * Returns all file options. - * + * * @return All file options */ public Map getFileOptions() { @@ -346,7 +347,7 @@ public class Project implements Comparable { /** * Sets all file options. - * + * * @param fileOptions * The file options */ @@ -366,7 +367,7 @@ public class Project implements Comparable { /** * Returns the edition of the project. - * + * * @return The edition of the project */ public int getEdition() { @@ -375,7 +376,7 @@ public class Project implements Comparable { /** * Sets the edition of the project. - * + * * @param edition * The edition to set */ @@ -385,7 +386,7 @@ public class Project implements Comparable { /** * Constructs the final request URI including the edition number. - * + * * @param offset * The offset for the edition number * @return The final request URI diff --git a/src/de/todesbaum/jsite/application/ProjectInserter.java b/src/de/todesbaum/jsite/application/ProjectInserter.java index a761951..e0ca446 100644 --- a/src/de/todesbaum/jsite/application/ProjectInserter.java +++ b/src/de/todesbaum/jsite/application/ProjectInserter.java @@ -424,6 +424,7 @@ public class ProjectInserter implements FileScannerListener, Runnable { System.out.println(message); } if (!finished) { + @SuppressWarnings("null") String messageName = message.getName(); if ("URIGenerated".equals(messageName)) { finalURI = message.get("URI"); @@ -445,6 +446,7 @@ public class ProjectInserter implements FileScannerListener, Runnable { /* post-insert work */ fireProjectInsertFinished(success, disconnected ? new IOException("Connection terminated") : null); if (success) { + @SuppressWarnings("null") String editionPart = finalURI.substring(finalURI.lastIndexOf('/') + 1); int newEdition = Integer.parseInt(editionPart); project.setEdition(newEdition); -- 2.7.4