Skip to content

Commit 7c1e147

Browse files
tHerrmanntHerrmann
committed
Improving generics support.
1 parent a8309f7 commit 7c1e147

File tree

46 files changed

+901
-695
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+901
-695
lines changed

‎src-modules/org/opencms/workplace/administration/CmsAdminMenu.java

+21-13
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import java.util.Collection;
4343
import java.util.Iterator;
4444
import java.util.Map;
45+
import java.util.Map.Entry;
4546

4647
import javax.servlet.http.HttpServletRequest;
4748

@@ -56,7 +57,9 @@ public class CmsAdminMenu extends CmsToolDialog {
5657
public static final String DEFAULT_TARGET = "admin_content";
5758

5859
/** Group container. */
59-
private CmsIdentifiableObjectContainer m_groupContainer = new CmsIdentifiableObjectContainer(true, true);
60+
private CmsIdentifiableObjectContainer<CmsAdminMenuGroup> m_groupContainer = new CmsIdentifiableObjectContainer<CmsAdminMenuGroup>(
61+
true,
62+
true);
6063

6164
/**
6265
* Default Constructor.<p>
@@ -79,7 +82,7 @@ public CmsAdminMenu(CmsJspActionElement jsp) {
7982
*
8083
* @param group the group
8184
*
82-
* @see I_CmsIdentifiableObjectContainer#addIdentifiableObject(String, Object)
85+
* @see CmsIdentifiableObjectContainer#addIdentifiableObject(String, Object)
8386
*/
8487
public void addGroup(CmsAdminMenuGroup group) {
8588

@@ -92,7 +95,7 @@ public void addGroup(CmsAdminMenuGroup group) {
9295
* @param group the group
9396
* @param position the position
9497
*
95-
* @see I_CmsIdentifiableObjectContainer#addIdentifiableObject(String, Object, float)
98+
* @see CmsIdentifiableObjectContainer#addIdentifiableObject(String, Object, float)
9699
*/
97100
public void addGroup(CmsAdminMenuGroup group, float position) {
98101

@@ -146,13 +149,13 @@ public CmsAdminMenuItem addItem(
146149
*
147150
* @return all initialized parameters of the current request
148151
*/
149-
public String allRequestParamsAsUrl(Collection excludes) {
152+
public String allRequestParamsAsUrl(Collection<String> excludes) {
150153

151154
StringBuffer result = new StringBuffer(512);
152-
Map params = getJsp().getRequest().getParameterMap();
153-
Iterator i = params.entrySet().iterator();
155+
Map<?, ?> params = getJsp().getRequest().getParameterMap();
156+
Iterator<?> i = params.entrySet().iterator();
154157
while (i.hasNext()) {
155-
Map.Entry entry = (Map.Entry)i.next();
158+
Entry<?, ?> entry = (Entry<?, ?>)i.next();
156159
String param = (String)entry.getKey();
157160
if ((excludes == null) || (!excludes.contains(param))) {
158161
if (result.length() > 0) {
@@ -180,18 +183,19 @@ public String allRequestParamsAsUrl(Collection excludes) {
180183
*
181184
* @return the group
182185
*
183-
* @see I_CmsIdentifiableObjectContainer#getObject(String)
186+
* @see CmsIdentifiableObjectContainer#getObject(String)
184187
*/
185188
public CmsAdminMenuGroup getGroup(String name) {
186189

187-
return (CmsAdminMenuGroup)m_groupContainer.getObject(name);
190+
return m_groupContainer.getObject(name);
188191
}
189192

190193
/**
191194
* Returns the admin manager.<p>
192195
*
193196
* @return the admin manager
194197
*/
198+
@Override
195199
public CmsToolManager getToolManager() {
196200

197201
return OpenCms.getWorkplaceManager().getToolManager();
@@ -207,9 +211,9 @@ public CmsToolManager getToolManager() {
207211
public String groupHtml(CmsWorkplace wp) {
208212

209213
StringBuffer html = new StringBuffer(2048);
210-
Iterator itHtml = m_groupContainer.elementList().iterator();
214+
Iterator<CmsAdminMenuGroup> itHtml = m_groupContainer.elementList().iterator();
211215
while (itHtml.hasNext()) {
212-
CmsAdminMenuGroup group = (CmsAdminMenuGroup)itHtml.next();
216+
CmsAdminMenuGroup group = itHtml.next();
213217
html.append(group.groupHtml(wp));
214218
}
215219
return html.toString();
@@ -229,9 +233,12 @@ public void installMenu() {
229233
helpMenu.addMenuItem(new CmsAdminContextHelpMenuItem());
230234
addGroup(helpMenu);
231235

232-
Iterator itElems = getToolManager().getToolsForPath(this, getToolManager().getBaseToolPath(this), false).iterator();
236+
Iterator<CmsTool> itElems = getToolManager().getToolsForPath(
237+
this,
238+
getToolManager().getBaseToolPath(this),
239+
false).iterator();
233240
while (itElems.hasNext()) {
234-
CmsTool tool = (CmsTool)itElems.next();
241+
CmsTool tool = itElems.next();
235242
// check visibility
236243
String link = tool.getHandler().getLink();
237244
if (link.indexOf("?") > 0) {
@@ -270,6 +277,7 @@ public void installMenu() {
270277
/**
271278
* @see org.opencms.workplace.CmsWorkplace#initWorkplaceRequestValues(org.opencms.workplace.CmsWorkplaceSettings, javax.servlet.http.HttpServletRequest)
272279
*/
280+
@Override
273281
protected void initWorkplaceRequestValues(CmsWorkplaceSettings settings, HttpServletRequest request) {
274282

275283
fillParamValues(request);

‎src-modules/org/opencms/workplace/administration/CmsAdminMenuGroup.java

+9-7
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
public class CmsAdminMenuGroup {
4343

4444
/** Item container. */
45-
private final CmsIdentifiableObjectContainer m_container = new CmsIdentifiableObjectContainer(true, true);
45+
private final CmsIdentifiableObjectContainer<CmsAdminMenuItem> m_container = new CmsIdentifiableObjectContainer<CmsAdminMenuItem>(
46+
true,
47+
true);
4648

4749
/** Dhtml id, from name. */
4850
private final String m_id;
@@ -67,7 +69,7 @@ public CmsAdminMenuGroup(String id, String name) {
6769
*
6870
* @param item the item
6971
*
70-
* @see org.opencms.workplace.tools.I_CmsIdentifiableObjectContainer#addIdentifiableObject(String, Object)
72+
* @see org.opencms.workplace.tools.CmsIdentifiableObjectContainer#addIdentifiableObject(String, Object)
7173
*/
7274
public void addMenuItem(CmsAdminMenuItem item) {
7375

@@ -80,7 +82,7 @@ public void addMenuItem(CmsAdminMenuItem item) {
8082
* @param item the item
8183
* @param position the position
8284
*
83-
* @see org.opencms.workplace.tools.I_CmsIdentifiableObjectContainer#addIdentifiableObject(String, Object, float)
85+
* @see org.opencms.workplace.tools.CmsIdentifiableObjectContainer#addIdentifiableObject(String, Object, float)
8486
*/
8587
public void addMenuItem(CmsAdminMenuItem item, float position) {
8688

@@ -98,11 +100,11 @@ public String getId() {
98100
}
99101

100102
/**
101-
* Retuns a list of menu items.<p>
103+
* Returns a list of menu items.<p>
102104
*
103105
* @return a list of <code>{@link CmsAdminMenuItem}</code>s
104106
*/
105-
public List getMenuItems() {
107+
public List<CmsAdminMenuItem> getMenuItems() {
106108

107109
return m_container.elementList();
108110
}
@@ -128,9 +130,9 @@ public String groupHtml(CmsWorkplace wp) {
128130

129131
StringBuffer html = new StringBuffer(512);
130132
html.append(htmlStart(wp));
131-
Iterator itItem = m_container.elementList().iterator();
133+
Iterator<CmsAdminMenuItem> itItem = m_container.elementList().iterator();
132134
while (itItem.hasNext()) {
133-
CmsAdminMenuItem item = (CmsAdminMenuItem)itItem.next();
135+
CmsAdminMenuItem item = itItem.next();
134136
html.append(item.itemHtml(wp));
135137
html.append("\n");
136138
}

‎src-modules/org/opencms/workplace/tools/accounts/CmsGroupDependenciesList.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
*
5454
* @since 6.0.0
5555
*/
56-
public class CmsGroupDependenciesList extends CmsGroupPrincipalDepemdenciesList {
56+
public class CmsGroupDependenciesList extends CmsGroupPrincipalDependenciesList {
5757

5858
/** Value for the delete action. */
5959
public static final int ACTION_DELETE = 131;

‎src-modules/org/opencms/workplace/tools/accounts/CmsGroupPrincipalDepemdenciesList.java ‎src-modules/org/opencms/workplace/tools/accounts/CmsGroupPrincipalDependenciesList.java

+34-22
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
*
6161
* @since 8.0.0
6262
*/
63-
public class CmsGroupPrincipalDepemdenciesList extends A_CmsListDialog {
63+
public class CmsGroupPrincipalDependenciesList extends A_CmsListDialog {
6464

6565
/** list action id constant. */
6666
public static final String LIST_ACTION_ICON = "ai";
@@ -91,7 +91,7 @@ public class CmsGroupPrincipalDepemdenciesList extends A_CmsListDialog {
9191
*
9292
* @param jsp an initialized JSP action element
9393
*/
94-
public CmsGroupPrincipalDepemdenciesList(CmsJspActionElement jsp) {
94+
public CmsGroupPrincipalDependenciesList(CmsJspActionElement jsp) {
9595

9696
this(LIST_ID, jsp);
9797
m_showAttributes = false;
@@ -104,7 +104,7 @@ public CmsGroupPrincipalDepemdenciesList(CmsJspActionElement jsp) {
104104
* @param req the JSP request
105105
* @param res the JSP response
106106
*/
107-
public CmsGroupPrincipalDepemdenciesList(PageContext context, HttpServletRequest req, HttpServletResponse res) {
107+
public CmsGroupPrincipalDependenciesList(PageContext context, HttpServletRequest req, HttpServletResponse res) {
108108

109109
this(new CmsJspActionElement(context, req, res));
110110
m_showAttributes = false;
@@ -116,7 +116,7 @@ public CmsGroupPrincipalDepemdenciesList(PageContext context, HttpServletRequest
116116
* @param listId the id of the specialized list
117117
* @param jsp an initialized JSP action element
118118
*/
119-
protected CmsGroupPrincipalDepemdenciesList(String listId, CmsJspActionElement jsp) {
119+
protected CmsGroupPrincipalDependenciesList(String listId, CmsJspActionElement jsp) {
120120

121121
super(
122122
jsp,
@@ -131,6 +131,7 @@ protected CmsGroupPrincipalDepemdenciesList(String listId, CmsJspActionElement j
131131
/**
132132
* @see org.opencms.workplace.list.A_CmsListDialog#executeListMultiActions()
133133
*/
134+
@Override
134135
public void executeListMultiActions() {
135136

136137
throwListUnsupportedActionException();
@@ -139,6 +140,7 @@ public void executeListMultiActions() {
139140
/**
140141
* @see org.opencms.workplace.list.A_CmsListDialog#executeListSingleActions()
141142
*/
143+
@Override
142144
public void executeListSingleActions() {
143145

144146
throwListUnsupportedActionException();
@@ -167,6 +169,7 @@ public void setParamGroupid(String groupId) {
167169
/**
168170
* @see org.opencms.workplace.list.A_CmsListDialog#fillDetails(java.lang.String)
169171
*/
172+
@Override
170173
protected void fillDetails(String detailId) {
171174

172175
// no-op
@@ -175,28 +178,31 @@ protected void fillDetails(String detailId) {
175178
/**
176179
* @see org.opencms.workplace.list.A_CmsListDialog#getListItems()
177180
*/
178-
protected List getListItems() throws CmsException {
181+
@Override
182+
protected List<CmsListItem> getListItems() throws CmsException {
179183

180-
CmsIdentifiableObjectContainer ret = new CmsIdentifiableObjectContainer(true, false);
181-
Iterator itGroups = CmsStringUtil.splitAsList(getParamGroupid(), CmsHtmlList.ITEM_SEPARATOR, true).iterator();
184+
CmsIdentifiableObjectContainer<CmsListItem> ret = new CmsIdentifiableObjectContainer<CmsListItem>(true, false);
185+
Iterator<String> itGroups = CmsStringUtil.splitAsList(getParamGroupid(), CmsHtmlList.ITEM_SEPARATOR, true).iterator();
182186
String storedSiteRoot = getCms().getRequestContext().getSiteRoot();
183187
try {
184188
getCms().getRequestContext().setSiteRoot("/");
185189
while (itGroups.hasNext()) {
186-
CmsGroup group = getCms().readGroup(new CmsUUID(itGroups.next().toString()));
190+
CmsGroup group = getCms().readGroup(new CmsUUID(itGroups.next()));
187191
// get content
188-
Set resources = getCms().getResourcesForPrincipal(group.getId(), null, m_showAttributes);
189-
Iterator itRes = resources.iterator();
192+
Set<CmsResource> resources = getCms().getResourcesForPrincipal(group.getId(), null, m_showAttributes);
193+
Iterator<CmsResource> itRes = resources.iterator();
190194
while (itRes.hasNext()) {
191-
CmsResource resource = (CmsResource)itRes.next();
192-
CmsListItem item = (CmsListItem)ret.getObject(resource.getResourceId().toString());
195+
CmsResource resource = itRes.next();
196+
CmsListItem item = ret.getObject(resource.getResourceId().toString());
193197
if (item == null) {
194198
item = getList().newItem(resource.getResourceId().toString());
195199
item.set(LIST_COLUMN_NAME, resource.getRootPath());
196200
item.set(LIST_COLUMN_TYPE, new Integer(resource.getTypeId()));
197-
Iterator itAces = getCms().getAccessControlEntries(resource.getRootPath(), false).iterator();
201+
Iterator<CmsAccessControlEntry> itAces = getCms().getAccessControlEntries(
202+
resource.getRootPath(),
203+
false).iterator();
198204
while (itAces.hasNext()) {
199-
CmsAccessControlEntry ace = (CmsAccessControlEntry)itAces.next();
205+
CmsAccessControlEntry ace = itAces.next();
200206
if (ace.getPrincipal().equals(group.getId())) {
201207
if (CmsStringUtil.isNotEmptyOrWhitespaceOnly(ace.getPermissions().getPermissionString())) {
202208
item.set(LIST_COLUMN_PERMISSIONS, group.getName()
@@ -209,9 +215,11 @@ protected List getListItems() throws CmsException {
209215
ret.addIdentifiableObject(item.getId(), item);
210216
} else {
211217
String oldData = (String)item.get(LIST_COLUMN_PERMISSIONS);
212-
Iterator itAces = getCms().getAccessControlEntries(resource.getRootPath(), false).iterator();
218+
Iterator<CmsAccessControlEntry> itAces = getCms().getAccessControlEntries(
219+
resource.getRootPath(),
220+
false).iterator();
213221
while (itAces.hasNext()) {
214-
CmsAccessControlEntry ace = (CmsAccessControlEntry)itAces.next();
222+
CmsAccessControlEntry ace = itAces.next();
215223
if (ace.getPrincipal().equals(group.getId())) {
216224
if (CmsStringUtil.isNotEmptyOrWhitespaceOnly(ace.getPermissions().getPermissionString())) {
217225
String data = group.getName() + ": " + ace.getPermissions().getPermissionString();
@@ -226,10 +234,10 @@ protected List getListItems() throws CmsException {
226234
}
227235
}
228236
// add users
229-
Iterator itUsers = getCms().getUsersOfGroup(group.getName()).iterator();
237+
Iterator<CmsUser> itUsers = getCms().getUsersOfGroup(group.getName()).iterator();
230238
while (itUsers.hasNext()) {
231-
CmsUser user = (CmsUser)itUsers.next();
232-
CmsListItem item = (CmsListItem)ret.getObject(user.getId().toString());
239+
CmsUser user = itUsers.next();
240+
CmsListItem item = ret.getObject(user.getId().toString());
233241
if (item == null) {
234242
item = getList().newItem(user.getId().toString());
235243
item.set(LIST_COLUMN_NAME, user.getName());
@@ -238,10 +246,10 @@ protected List getListItems() throws CmsException {
238246
}
239247
}
240248
// add child groups
241-
Iterator itChildren = getCms().getChildren(group.getName(), false).iterator();
249+
Iterator<CmsGroup> itChildren = getCms().getChildren(group.getName(), false).iterator();
242250
while (itChildren.hasNext()) {
243-
CmsGroup child = (CmsGroup)itChildren.next();
244-
CmsListItem item = (CmsListItem)ret.getObject(child.getId().toString());
251+
CmsGroup child = itChildren.next();
252+
CmsListItem item = ret.getObject(child.getId().toString());
245253
if (item == null) {
246254
item = getList().newItem(child.getId().toString());
247255
item.set(LIST_COLUMN_NAME, child.getName());
@@ -259,6 +267,7 @@ protected List getListItems() throws CmsException {
259267
/**
260268
* @see org.opencms.workplace.CmsWorkplace#initMessages()
261269
*/
270+
@Override
262271
protected void initMessages() {
263272

264273
// add specific dialog resource bundle
@@ -272,6 +281,7 @@ protected void initMessages() {
272281
/**
273282
* @see org.opencms.workplace.list.A_CmsListDialog#setColumns(org.opencms.workplace.list.CmsListMetadata)
274283
*/
284+
@Override
275285
protected void setColumns(CmsListMetadata metadata) {
276286

277287
// create column for edit
@@ -348,6 +358,7 @@ protected void setIconActions(CmsListColumnDefinition iconCol) {
348358
/**
349359
* @see org.opencms.workplace.list.A_CmsListDialog#setIndependentActions(org.opencms.workplace.list.CmsListMetadata)
350360
*/
361+
@Override
351362
protected void setIndependentActions(CmsListMetadata metadata) {
352363

353364
// no-op
@@ -356,6 +367,7 @@ protected void setIndependentActions(CmsListMetadata metadata) {
356367
/**
357368
* @see org.opencms.workplace.list.A_CmsListDialog#setMultiActions(org.opencms.workplace.list.CmsListMetadata)
358369
*/
370+
@Override
359371
protected void setMultiActions(CmsListMetadata metadata) {
360372

361373
// no-op

0 commit comments

Comments
 (0)