Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;

import org.apache.roller.weblogger.business.MediaFileManager;
import org.apache.roller.weblogger.business.UserManager;
Expand Down Expand Up @@ -614,7 +613,7 @@ public List<WeblogTemplate> getTemplates(Weblog weblog) throws WebloggerExceptio
@Override
public Map<String, Long> getWeblogHandleLetterMap() throws WebloggerException {
String lc = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
Map<String, Long> results = new TreeMap<>();
Map<String, Long> results = new HashMap<>();
TypedQuery<Long> query = strategy.getNamedQuery(
"Weblog.getCountByHandleLike", Long.class);
for (int i=0; i<26; i++) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
package org.apache.roller.weblogger.pojos;

import java.util.List;
import java.util.Set;
import java.util.HashSet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.util.Utilities;
Expand Down Expand Up @@ -49,14 +51,14 @@ public void setActionsAsList(List<String> actionsList) {
}

public boolean hasAction(String action) {
List<String> actionList = getActionsAsList();
return actionList.contains(action);
Set<String> actionSet = new HashSet<>(getActionsAsList());
return actionSet.contains(action);
}

public boolean hasActions(List<String> actionsToCheck) {
List<String> actionList = getActionsAsList();
Set<String> actionSet = new HashSet<>(getActionsAsList());
for (String actionToCheck : actionsToCheck) {
if (!actionList.contains(actionToCheck)) {
if (!actionSet.contains(actionToCheck)) {
return false;
}
}
Expand All @@ -68,9 +70,9 @@ public boolean hasActions(List<String> actionsToCheck) {
*/
public void addActions(ObjectPermission perm) {
List<String> newActions = perm.getActionsAsList();
List<String> updatedActions = getActionsAsList();
Set<String> updatedActionSet = new HashSet<>(updatedActions);
for (String newAction : newActions) {
if (!updatedActions.contains(newAction)) {
if (!updatedActionSet.contains(newAction)) {
updatedActions.add(newAction);
}
}
Expand All @@ -81,9 +83,9 @@ public void addActions(ObjectPermission perm) {
* Merge actions into this permission.
*/
public void addActions(List<String> newActions) {
List<String> updatedActions = getActionsAsList();
Set<String> updatedActionSet = new HashSet<>(updatedActions);
for (String newAction : newActions) {
if (!updatedActions.contains(newAction)) {
if (!updatedActionSet.contains(newAction)) {
updatedActions.add(newAction);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.HashSet;
import org.apache.roller.config.RollerConfig;
import org.apache.roller.pojos.Template;
import org.apache.roller.ui.rendering.Renderer;
Expand All @@ -31,13 +33,13 @@
*/
public class BSFRendererFactory implements RendererFactory {
private static String[] names = {"groovy", "jruby", "javascript"};
private static final List bsfLanguages;
private static final Set<String> bsfLanguages;
static {
String value = RollerConfig.getProperty("bsfrenderer.languageNames");
if (value != null) {
names = Utilities.stringToStringArray(value,",");
}
bsfLanguages = Arrays.asList(names);
bsfLanguages = new HashSet<>(Arrays.asList(names));
}
public Renderer getRenderer(Template template) {
Renderer renderer = null;
Expand Down