commit 83f50f9ec20d57e8b630870fd387d03151aaab96 from: leo date: Wed Feb 8 09:03:21 2006 UTC code style update commit - 94c82cf8f19e3c01657205fe07aa2dcf076d2c45 commit + 83f50f9ec20d57e8b630870fd387d03151aaab96 blob - 67c67754c43bf6eed74b761bad49865b8d72ab9d blob + 7f36b0ede314c280aed27068a38d4b673437f1ac --- src/org/snipsnap/date/Month.java +++ src/org/snipsnap/date/Month.java @@ -26,19 +26,11 @@ package org.snipsnap.date; import org.radeox.util.i18n.ResourceManager; import snipsnap.api.app.Application; -import snipsnap.api.config.Configuration; import snipsnap.api.snip.Snip; -import snipsnap.api.snip.SnipLink; import snipsnap.api.snip.SnipSpaceFactory; import java.text.DateFormatSymbols; -import java.util.Calendar; -import java.util.GregorianCalendar; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Set; +import java.util.*; /** * Object that generates a View of the month @@ -48,15 +40,14 @@ import java.util.Set; */ public class Month { - // private String[] months = { // "Januar", "Februar", "Maerz", "April", // "Mai", "Juni", "Juli", "August", // "September", "Oktober", "November", "Dezember" // }; - private String[] monthsValue = { - "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12" - }; +// private String[] monthsValue = { +// "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12" +// }; // @TODO Use locale private String[] months; @@ -68,9 +59,9 @@ public class Month { * The days in each month. */ public final static int dom[] = { - 31, 28, 31, 30, /* jan feb mar apr */ - 31, 30, 31, 31, /* may jun jul aug */ - 30, 31, 30, 31 /* sep oct nov dec */ + 31, 28, 31, 30, /* jan feb mar apr */ + 31, 30, 31, 31, /* may jun jul aug */ + 30, 31, 30, 31 /* sep oct nov dec */ }; public Month() { @@ -83,8 +74,8 @@ public class Month { public static String toKey(Calendar calendar) { return toKey(calendar.get(Calendar.YEAR), - calendar.get(Calendar.MONTH) + 1, - calendar.get(Calendar.DAY_OF_MONTH)); + calendar.get(Calendar.MONTH) + 1, + calendar.get(Calendar.DAY_OF_MONTH)); } public static String toKey(int year, int month, int day) { blob - 1f95bc3fb0993b8945de60f1d9718ea90adf95a6 blob + 6425e1cd2ffcc2001e85cead355774d5389322e6 --- src/org/snipsnap/graph/NameSpaceTreeBuilder.java +++ src/org/snipsnap/graph/NameSpaceTreeBuilder.java @@ -51,7 +51,7 @@ public class NameSpaceTreeBuilder implements TreeBuild Tree tree = new Tree(parent); int depth = -1; - int currentDepth = -1; + int currentDepth; for (int i = 0; i < snips.length; i++) { Snip snip = snips[i]; String elements[] = snip.getName().split("/"); blob - 14b765099a2f2c73ea3279be148b4dc9ae48bf55 blob + 3b480b1da3a45c921c060908e2a2a97e6cda4e7b --- src/org/snipsnap/net/admin/ConfigureServlet.java +++ src/org/snipsnap/net/admin/ConfigureServlet.java @@ -25,17 +25,15 @@ package org.snipsnap.net.admin; import org.radeox.util.logging.Logger; -import snipsnap.api.app.Application; import org.snipsnap.app.ApplicationManager; -import snipsnap.api.config.Configuration; import org.snipsnap.config.ConfigurationManager; import org.snipsnap.config.ConfigurationProxy; import org.snipsnap.config.InitializeDatabase; -import snipsnap.api.container.Components; import org.snipsnap.net.filter.MultipartWrapper; +import snipsnap.api.config.Configuration; +import snipsnap.api.container.Components; import snipsnap.api.snip.Snip; import snipsnap.api.snip.SnipSpace; -import snipsnap.api.user.User; import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; @@ -43,20 +41,9 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; +import java.io.*; import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.TimeZone; +import java.util.*; /** * @author Matthias L. Jugel @@ -100,49 +87,49 @@ public class ConfigureServlet extends HttpServlet { protected final static String STEP_MAINTENANCE = "maintenance"; private final static List LOGIN_STEPS = Arrays.asList(new String[]{ - STEP_LOGIN + STEP_LOGIN }); private final static List BASIC_STEPS = Arrays.asList(new String[]{ - STEP_ADMINISTRATOR, - STEP_APPLICATION, - STEP_FINISH, + STEP_ADMINISTRATOR, + STEP_APPLICATION, + STEP_FINISH, }); private final static List EXPERT_STEPS = Arrays.asList(new String[]{ - STEP_THEME, - STEP_LOCALIZATION, - STEP_PERMISSIONS, - STEP_MAIL, - STEP_MOBLOG, - STEP_PROXY, - STEP_EXPERT, + STEP_THEME, + STEP_LOCALIZATION, + STEP_PERMISSIONS, + STEP_MAIL, + STEP_MOBLOG, + STEP_PROXY, + STEP_EXPERT, }); private final static List CONFIG_STEPS = Arrays.asList(new String[]{ - STEP_USERS, - STEP_IMPORT, - STEP_EXPORT, - STEP_SEARCH, - STEP_MAINTENANCE + STEP_USERS, + STEP_IMPORT, + STEP_EXPORT, + STEP_SEARCH, + STEP_MAINTENANCE }); private final static List HANDLERS = Arrays.asList(new String[]{ - "org.snipsnap.net.admin.Maintenance", - "org.snipsnap.net.admin.DatabaseExport", - "org.snipsnap.net.admin.DatabaseImport", - "org.snipsnap.net.admin.ManageSearchEngine", - "org.snipsnap.net.admin.ManageUsers", - "org.snipsnap.net.admin.SetupAdministrator", - "org.snipsnap.net.admin.SetupApplication", - "org.snipsnap.net.admin.SetupDatabase", - "org.snipsnap.net.admin.SetupExpert", - "org.snipsnap.net.admin.SetupLocalization", - "org.snipsnap.net.admin.SetupMail", - "org.snipsnap.net.admin.SetupMoblog", - "org.snipsnap.net.admin.SetupPermissions", - "org.snipsnap.net.admin.SetupProxy", - "org.snipsnap.net.admin.SetupTheme" + "org.snipsnap.net.admin.Maintenance", + "org.snipsnap.net.admin.DatabaseExport", + "org.snipsnap.net.admin.DatabaseImport", + "org.snipsnap.net.admin.ManageSearchEngine", + "org.snipsnap.net.admin.ManageUsers", + "org.snipsnap.net.admin.SetupAdministrator", + "org.snipsnap.net.admin.SetupApplication", + "org.snipsnap.net.admin.SetupDatabase", + "org.snipsnap.net.admin.SetupExpert", + "org.snipsnap.net.admin.SetupLocalization", + "org.snipsnap.net.admin.SetupMail", + "org.snipsnap.net.admin.SetupMoblog", + "org.snipsnap.net.admin.SetupPermissions", + "org.snipsnap.net.admin.SetupProxy", + "org.snipsnap.net.admin.SetupTheme" }); Map handlers = new HashMap(); @@ -193,8 +180,8 @@ public class ConfigureServlet extends HttpServlet { config = null; } - ApplicationManager appManager = null; - String appOid = null; + ApplicationManager appManager; + String appOid; if (config == null && ConfigurationProxy.getInstance().isInstalled()) { appManager = (ApplicationManager) Components.getComponent(ApplicationManager.class); appOid = appManager.getApplication(prefix != null && !"".equals(prefix) ? prefix : "/"); @@ -324,14 +311,15 @@ public class ConfigureServlet extends HttpServlet { return; } else if (errors.size() == 0) { if (request.getParameter("finish") != null) { - Map params = request.getParameterMap(); - Iterator iterator = params.keySet().iterator(); - Map paramMap = new HashMap(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - String[] values = (String[]) params.get(key); - paramMap.put(key, values[0]); - } +// TODO: What was that for? +// Map params = request.getParameterMap(); +// Iterator iterator = params.keySet().iterator(); +// Map paramMap = new HashMap(); +// while (iterator.hasNext()) { +// String key = (String) iterator.next(); +// String[] values = (String[]) params.get(key); +// paramMap.put(key, values[0]); +// } try { InitializeDatabase.init(config, new OutputStreamWriter(System.out)); @@ -373,8 +361,8 @@ public class ConfigureServlet extends HttpServlet { SnipSpace space = (SnipSpace) snipsnap.api.container.Components.getComponent(snipsnap.api.snip.SnipSpace.class); ByteArrayOutputStream configStream = new ByteArrayOutputStream(); config.store(configStream); - snipsnap.api.snip.Snip configSnip = space.load(Configuration.SNIPSNAP_CONFIG); - configSnip.setContent(new String(configStream.toString("UTF-8"))); + Snip configSnip = space.load(Configuration.SNIPSNAP_CONFIG); + configSnip.setContent(configStream.toString("UTF-8")); space.store(configSnip); FileOutputStream globalsOs = new FileOutputStream(new File(config.getWebInfDir(), "application.conf")); blob - 6cb556dce90dcd429ae23b886aee933228e800c2 blob + 875eda68c7c0ede2d7ca12a1d50dc3cb928a0ffd --- src/org/snipsnap/snip/Access.java +++ src/org/snipsnap/snip/Access.java @@ -26,10 +26,12 @@ package org.snipsnap.snip; import org.radeox.util.logging.Logger; -import snipsnap.api.app.Application; +import org.snipsnap.util.ApplicationAwareMap; import snipsnap.api.container.Components; +import snipsnap.api.snip.Snip; +import snipsnap.api.snip.SnipLink; +import snipsnap.api.snip.SnipSpace; import snipsnap.api.user.User; -import org.snipsnap.util.ApplicationAwareMap; import javax.servlet.http.HttpServletRequest; import java.io.BufferedReader; @@ -39,17 +41,8 @@ import java.io.InputStreamReader; import java.net.MalformedURLException; import java.net.URL; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; -import snipsnap.api.snip.*; -import snipsnap.api.snip.SnipSpace; -import snipsnap.api.snip.Snip; -import snipsnap.api.snip.SnipLink; - /** * Stores Access information for a snip like viewCount, backLinks, ... * @@ -161,7 +154,7 @@ public class Access { String name = SnipLink.decode(url); if (!snipsnap.api.app.Application.get().getConfiguration().getStartSnip().equals(name) - && !snipName.equals(name)) { + && !snipName.equals(name)) { snipLinks.addLink(name); } }