diff --git a/src/main/java/de/bps/course/nodes/den/DENRunController.java b/src/main/java/de/bps/course/nodes/den/DENRunController.java
index b2a55a449139f3f1791b6ca1ac0f3f5047455d2f..f50c1d8e1f62dded777180cf86d17329eb681fec 100644
--- a/src/main/java/de/bps/course/nodes/den/DENRunController.java
+++ b/src/main/java/de/bps/course/nodes/den/DENRunController.java
@@ -99,7 +99,7 @@ public class DENRunController extends BasicController implements GenericEventLis
denManager = DENManager.getInstance();
//prepare table for run view
- createOrUpdateDateTable(ureq, getWindowControl(), denCourseNode);
+ createOrUpdateDateTable(ureq, denCourseNode);
runDENTable = denManager.createRunDatesTable(ureq, wControl, getTranslator(), runTableData);
listenTo(runDENTable);
@@ -147,7 +147,7 @@ public class DENRunController extends BasicController implements GenericEventLis
* @param denCourseNode
* @param initialize
*/
- private void createOrUpdateDateTable(UserRequest ureq, WindowControl wControl, DENCourseNode denCourseNode) {
+ private void createOrUpdateDateTable(UserRequest ureq, DENCourseNode denCourseNode) {
//prepare table for run view
runTableDataList = denManager.getDENEvents(ores.getResourceableId(), denCourseNode.getIdent());
runTableData = new DENRunTableDataModel(runTableDataList, ureq, denCourseNode, cancelEnrollEnabled, getTranslator());
@@ -204,7 +204,7 @@ public class DENRunController extends BasicController implements GenericEventLis
status = denManager.cancelEnroll(ureq.getIdentity(), calEvent, ores, courseNode);
if(!status.isCancelled()) showError();
}
- createOrUpdateDateTable(ureq, getWindowControl(), courseNode);
+ createOrUpdateDateTable(ureq, courseNode);
runDENTable.setTableDataModel(runTableData);
fireEvent(ureq, Event.DONE_EVENT);
// inform subscription context about changes
diff --git a/src/main/java/org/olat/core/gui/control/generic/spacesaver/ShrinkController.java b/src/main/java/org/olat/core/gui/control/generic/spacesaver/ShrinkController.java
index eb12dc5cb00fbf98bfd55f434a53084a6b00dc83..4ef546ab3ff2436a727331fe85ce34dd0493272b 100644
--- a/src/main/java/org/olat/core/gui/control/generic/spacesaver/ShrinkController.java
+++ b/src/main/java/org/olat/core/gui/control/generic/spacesaver/ShrinkController.java
@@ -31,7 +31,6 @@ import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.velocity.VelocityContainer;
import org.olat.core.gui.control.DefaultController;
import org.olat.core.gui.control.Event;
-import org.olat.core.gui.control.WindowControl;
import org.olat.core.util.Util;
/**
@@ -62,7 +61,7 @@ public class ShrinkController extends DefaultController {
* @param shrinkcontent
* @param title the name of the link to click (e.g "Details")
*/
- public ShrinkController(UserRequest ureq, WindowControl wControl, boolean initiallyExpanded, Component shrinkcontent, String title) {
+ public ShrinkController(boolean initiallyExpanded, Component shrinkcontent, String title) {
super(null);
this.shrinkcontent = shrinkcontent;
isLarge = initiallyExpanded;
diff --git a/src/main/java/org/olat/fileresource/types/ScormCPFileResource.java b/src/main/java/org/olat/fileresource/types/ScormCPFileResource.java
index fc9c3294fd650b1bddc47e4f659c9e185942f42c..0215ab5fdf3792af32ac1eaad6eb53694c9049fd 100644
--- a/src/main/java/org/olat/fileresource/types/ScormCPFileResource.java
+++ b/src/main/java/org/olat/fileresource/types/ScormCPFileResource.java
@@ -128,7 +128,7 @@ public class ScormCPFileResource extends FileResource {
throw new AddingResourceException("scorm.no.scorm.namespace");
}
- Map nsuris = new HashMap(5);
+ Map<String, Object> nsuris = new HashMap<>(5);
nsuris.put("ns", nsuri);
nsuris.put("adluri", adluri);
//we might have a scorm 2004 which we do not yet support
@@ -161,7 +161,7 @@ public class ScormCPFileResource extends FileResource {
if (sequences.size() > 0) throw new AddingResourceException("scorm.found.seqencing"); // seqencing elements found -> scorm 2004
}
- Set set = new HashSet();
+ Set<String> set = new HashSet<String>();
for (Iterator iter = items.iterator(); iter.hasNext();) {
Element item = (Element) iter.next();
String identifier = item.attributeValue("identifier");
diff --git a/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java b/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java
index 34d79cee5ca21229504686fe3a8902ad329c633d..e96503c19acfdc1b71d80e127ba7c9ed13613f74 100644
--- a/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java
+++ b/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java
@@ -348,7 +348,7 @@ public abstract class AbstractBusinessGroupListController extends BasicControlle
cleanUpPopups();
} else if (source == leaveDialogBox) {
if (event != Event.CANCELLED_EVENT && DialogBoxUIFactory.isYesEvent(event)) {
- doLeave(ureq, (BusinessGroup)leaveDialogBox.getUserObject());
+ doLeave((BusinessGroup)leaveDialogBox.getUserObject());
reloadModel();
}
} else if (source == groupCreateController) {
@@ -453,7 +453,7 @@ public abstract class AbstractBusinessGroupListController extends BasicControlle
*
* @param ureq
*/
- private void doLeave(UserRequest ureq, BusinessGroup group) {
+ private void doLeave(BusinessGroup group) {
List<Identity> identityToRemove = Collections.singletonList(getIdentity());
// 1) remove as owner
if (businessGroupService.hasRoles(getIdentity(), group, GroupRoles.coach.name())) {
diff --git a/src/main/java/org/olat/gui/demo/guidemo/GuiDemoFlexiFormMainController.java b/src/main/java/org/olat/gui/demo/guidemo/GuiDemoFlexiFormMainController.java
index fb2361b99fda4d7f70f8af147f237a572d359f37..3e5fcbc809c1f8dd96e4158e4364b584c002bb59 100644
--- a/src/main/java/org/olat/gui/demo/guidemo/GuiDemoFlexiFormMainController.java
+++ b/src/main/java/org/olat/gui/demo/guidemo/GuiDemoFlexiFormMainController.java
@@ -131,7 +131,7 @@ public class GuiDemoFlexiFormMainController extends BasicController {
sourceP = new Panel("sourceP");
VelocityContainer sourceVC = createVelocityContainer(firstDemo);
- ShrinkController sc = new ShrinkController(ureq, getWindowControl(), false, sourceVC, "toggle source");
+ ShrinkController sc = new ShrinkController(false, sourceVC, "toggle source");
sourceP.setContent(sc.getInitialComponent());
content_sourceVC.put("content", mainVC);
@@ -167,7 +167,7 @@ public class GuiDemoFlexiFormMainController extends BasicController {
ControllerCreator cc = demos.get(uob);
//update source
VelocityContainer sourceVC = createVelocityContainer(uob);
- ShrinkController sc = new ShrinkController(ureq, getWindowControl(), false, sourceVC, "toggle source");
+ ShrinkController sc = new ShrinkController(false, sourceVC, "toggle source");
sourceP.setContent(sc.getInitialComponent());
//cleanup former democontroller
diff --git a/src/main/java/org/olat/ims/qti/QTI12EditorController.java b/src/main/java/org/olat/ims/qti/QTI12EditorController.java
index 6690513f80dbf43e71cb716852ef75106dddb41e..8cc42378d148fd3711eafffaf9c72bb74eeb7f76 100644
--- a/src/main/java/org/olat/ims/qti/QTI12EditorController.java
+++ b/src/main/java/org/olat/ims/qti/QTI12EditorController.java
@@ -27,9 +27,7 @@ import org.olat.core.gui.components.velocity.VelocityContainer;
import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl;
import org.olat.core.gui.control.controller.BasicController;
-import org.olat.core.gui.translator.Translator;
import org.olat.core.gui.util.SyntheticUserRequest;
-import org.olat.core.util.Util;
import org.olat.core.util.event.GenericEventListener;
import org.olat.core.util.vfs.VFSContainer;
import org.olat.core.util.vfs.VFSContainerMapper;
@@ -73,12 +71,11 @@ public class QTI12EditorController extends BasicController implements QPoolItemE
} else {
Item item = QTIEditHelper.readItemXml(leaf);
if(item != null && !item.isAlient()) {
- Translator translator = Util.createPackageTranslator(QTIEditorPackage.class, getLocale());
VFSContainer directory = qpoolService.getRootDirectory(qitem);
String mapperUrl = registerMapper(ureq, new VFSContainerMapper(directory));
QTIDocument doc = new QTIDocument();
QTIEditorPackage qtiPackage = new QTI12ItemEditorPackage(item, doc, mapperUrl, leaf, directory, this);
- editorsCtrl = new ItemNodeTabbedFormController(item, qtiPackage, ureq, getWindowControl(), translator, false);
+ editorsCtrl = new ItemNodeTabbedFormController(item, qtiPackage, ureq, getWindowControl(), false);
editorsCtrl.addTabs(mainPanel);
listenTo(editorsCtrl);
}
diff --git a/src/main/java/org/olat/ims/qti/editor/ItemNodeTabbedFormController.java b/src/main/java/org/olat/ims/qti/editor/ItemNodeTabbedFormController.java
index 690453749422e34c908bc1a9c9378375d23f46c5..fd8ea7fa3566ce706cc8112446854b931dd43e29 100644
--- a/src/main/java/org/olat/ims/qti/editor/ItemNodeTabbedFormController.java
+++ b/src/main/java/org/olat/ims/qti/editor/ItemNodeTabbedFormController.java
@@ -34,7 +34,6 @@ import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl;
import org.olat.core.gui.control.generic.tabbable.TabbableDefaultController;
-import org.olat.core.gui.translator.Translator;
import org.olat.ims.qti.editor.beecom.objects.Item;
import org.olat.ims.qti.editor.beecom.objects.Question;
@@ -60,7 +59,7 @@ public class ItemNodeTabbedFormController extends TabbableDefaultController {
* @param wControl
* @param trnsltr
*/
- public ItemNodeTabbedFormController(Item item, QTIEditorPackage qtiPackage, UserRequest ureq, WindowControl wControl, Translator trnsltr,
+ public ItemNodeTabbedFormController(Item item, QTIEditorPackage qtiPackage, UserRequest ureq, WindowControl wControl,
boolean restrictedEdit) {
super(ureq, wControl);
this.restrictedEdit = restrictedEdit;
diff --git a/src/main/java/org/olat/ims/qti/editor/tree/ItemNode.java b/src/main/java/org/olat/ims/qti/editor/tree/ItemNode.java
index c9fb561108da0de0eca9940c659171505eb3ca6d..2b7397ce77bb3bca06f8c1e97f7b7b39d3e5bd8c 100644
--- a/src/main/java/org/olat/ims/qti/editor/tree/ItemNode.java
+++ b/src/main/java/org/olat/ims/qti/editor/tree/ItemNode.java
@@ -125,7 +125,7 @@ public class ItemNode extends GenericQtiNode {
if (myTabbedPane == null) {
try {
myTabbedPane = new TabbedPane("tabbedPane", ureq.getLocale());
- TabbableController tabbCntrllr = new ItemNodeTabbedFormController(item, qtiPackage, ureq, wControl, trnsltr, editorMainController
+ TabbableController tabbCntrllr = new ItemNodeTabbedFormController(item, qtiPackage, ureq, wControl, editorMainController
.isRestrictedEdit());
tabbCntrllr.addTabs(myTabbedPane);
tabbCntrllr.addControllerListener(editorMainController);
diff --git a/src/main/java/org/olat/ldap/LDAPHelper.java b/src/main/java/org/olat/ldap/LDAPHelper.java
index 0fe78f0f76610772b21157743704d7eef4652787..20e2846e9c7ca07c15451dda379d92c593046d19 100644
--- a/src/main/java/org/olat/ldap/LDAPHelper.java
+++ b/src/main/java/org/olat/ldap/LDAPHelper.java
@@ -220,9 +220,9 @@ public class LDAPHelper {
try {
keyStore = KeyStore.getInstance(LDAPLoginModule.getTrustStoreType());
keyStore.load(new FileInputStream(LDAPLoginModule.getTrustStoreLocation()), (LDAPLoginModule.getTrustStorePwd() != null) ? LDAPLoginModule.getTrustStorePwd().toCharArray() : null);
- Enumeration aliases = keyStore.aliases();
+ Enumeration<String> aliases = keyStore.aliases();
while (aliases.hasMoreElements()) {
- String alias = (String) aliases.nextElement();
+ String alias = aliases.nextElement();
Certificate cert = keyStore.getCertificate(alias);
if (cert instanceof X509Certificate) {
return isCertificateValid((X509Certificate)cert, daysFromNow);
diff --git a/src/main/java/org/olat/modules/iq/IQComponentRenderer.java b/src/main/java/org/olat/modules/iq/IQComponentRenderer.java
index 5bb9579b8a7c96fd48d932ecf83910b5443e7a88..c90ff1a8fb2685c30e27746ffb3f86615238476d 100644
--- a/src/main/java/org/olat/modules/iq/IQComponentRenderer.java
+++ b/src/main/java/org/olat/modules/iq/IQComponentRenderer.java
@@ -301,11 +301,8 @@ public class IQComponentRenderer implements ComponentRenderer {
long sSec = millis / 1000;
long sMin = sSec / 60;
sSec = sSec - (sMin * 60);
- StringOutput sb = new StringOutput();
- sb.append(sMin);
- sb.append("' ");
- sb.append(sSec);
- sb.append("\"");
+ StringBuilder sb = new StringBuilder();
+ sb.append(sMin).append("' ").append(sSec).append("\"");
return sb.toString();
}
@@ -530,7 +527,7 @@ public class IQComponentRenderer implements ComponentRenderer {
if (itc.isOpen()) {
displayItem(sb, renderer, ubu, itc, ai);
} else {
- displayItemClosed(sb,renderer,itc);
+ displayItemClosed(sb,renderer);
}
}
}
@@ -541,7 +538,7 @@ public class IQComponentRenderer implements ComponentRenderer {
* @param renderer
* @param itc
*/
- private void displayItemClosed(StringOutput sb, Renderer renderer,ItemContext itc) {
+ private void displayItemClosed(StringOutput sb, Renderer renderer) {
StringBuilder buffer = new StringBuilder(100);
buffer.append("<div class=\"b_warning\"><strong>").append(renderer.getTranslator().translate("couldNotDisplayItem")).append("</strong></div>");
sb.append(buffer);
diff --git a/src/main/java/org/olat/modules/iq/IQManager.java b/src/main/java/org/olat/modules/iq/IQManager.java
index 63e6ce05ea1ee98884a634fa8a19893c4909951d..1be5d31d197e7fb2c680ed562b38921cd8f1eba7 100644
--- a/src/main/java/org/olat/modules/iq/IQManager.java
+++ b/src/main/java/org/olat/modules/iq/IQManager.java
@@ -266,9 +266,9 @@ public class IQManager implements UserDataDeletable {
*/
public ItemsInput getItemsInput(UserRequest ureq) {
ItemsInput result = new ItemsInput();
- Enumeration params = ureq.getHttpReq().getParameterNames();
+ Enumeration<String> params = ureq.getHttpReq().getParameterNames();
while (params.hasMoreElements()) {
- String paramKey = (String) params.nextElement();
+ String paramKey = params.nextElement();
StringTokenizer st = new StringTokenizer(paramKey, "§", false);
String value = ureq.getParameter(paramKey);
if (st.countTokens() == 4) {
diff --git a/src/main/java/org/olat/modules/scorm/server/sequence/SequenceManager.java b/src/main/java/org/olat/modules/scorm/server/sequence/SequenceManager.java
index 3850ce08c5d41ae268b42810157d300d44234706..7edcc63805be25ce4184c3e60d853757dc8ef7aa 100644
--- a/src/main/java/org/olat/modules/scorm/server/sequence/SequenceManager.java
+++ b/src/main/java/org/olat/modules/scorm/server/sequence/SequenceManager.java
@@ -55,7 +55,7 @@ public class SequenceManager extends BasicManager {
/**
* our hashtable of reloaditemsequences
*/
- private Hashtable _itemSequences = new Hashtable();
+ private Hashtable<String,ItemSequence> _itemSequences = new Hashtable<>();
/**
* A string to hold our currently loaded sco.
@@ -91,7 +91,7 @@ public class SequenceManager extends BasicManager {
public String findFirstItemToLaunch() {
for (int i = 0; i <= _itemCount; i++) {
String id = findItemFromIndex(i);
- ItemSequence anItem = (ItemSequence) _itemSequences.get(id);
+ ItemSequence anItem = _itemSequences.get(id);
String preReqs = "";
if (anItem.hasPrerequisites()) {
preReqs = anItem.getPrerequisites();
@@ -114,10 +114,10 @@ public class SequenceManager extends BasicManager {
* @return package status
*/
public String[][] getPackageStatus() {
- Vector v = new Vector();
+ Vector<String[]> v = new Vector<>();
for (int i = 0; i <= _itemCount; i++) {
String id = findItemFromIndex(i);
- ItemSequence anItem = (ItemSequence) _itemSequences.get(id);
+ ItemSequence anItem = _itemSequences.get(id);
if (!anItem.getLaunchUrl().equals("javascript:void(0)")) {
//
String[] itemStatus = { String.valueOf(anItem.getSequence()), _prereqManager.getStatus(id) };
@@ -216,7 +216,7 @@ public class SequenceManager extends BasicManager {
* @return an ItemSequence
*/
public ItemSequence getItem(String itemId) {
- ItemSequence anItem = (ItemSequence) _itemSequences.get(itemId);
+ ItemSequence anItem = _itemSequences.get(itemId);
return anItem;
}
@@ -262,7 +262,7 @@ public class SequenceManager extends BasicManager {
* @return an url string
*/
public String getLaunchFromId(String scoIdentifier) {
- ItemSequence anItem = (ItemSequence) _itemSequences.get(scoIdentifier);
+ ItemSequence anItem = _itemSequences.get(scoIdentifier);
String theURL = anItem.getLaunchUrl();
if (theURL == null) theURL = "";
return theURL;
@@ -276,7 +276,7 @@ public class SequenceManager extends BasicManager {
*/
public int getSequenceFromId(String scoIdentifier) {
if (scoIdentifier.equals(COURSE_COMPLETED)) { return COURSE_COMPLETED_VALUE; }
- ItemSequence anItem = (ItemSequence) _itemSequences.get(scoIdentifier);
+ ItemSequence anItem = _itemSequences.get(scoIdentifier);
return anItem.getSequence();
}
@@ -288,10 +288,10 @@ public class SequenceManager extends BasicManager {
* @return a sco ID
*/
public String findItemFromIndex(int index) {
- Enumeration keys = _itemSequences.keys();
+ Enumeration<String> keys = _itemSequences.keys();
while (keys.hasMoreElements()) {
- String scoID = (String) keys.nextElement();
- ItemSequence anItem = (ItemSequence) _itemSequences.get(scoID);
+ String scoID = keys.nextElement();
+ ItemSequence anItem = _itemSequences.get(scoID);
if (anItem.getSequence() == index) { return anItem.getItemId(); }
}
return null;
@@ -304,7 +304,7 @@ public class SequenceManager extends BasicManager {
* @return true or false
*/
public boolean isFirstItem(String scoIdentifier) {
- ItemSequence anItem = (ItemSequence) _itemSequences.get(scoIdentifier);
+ ItemSequence anItem = _itemSequences.get(scoIdentifier);
int seqPosition = anItem.getSequence();
return (seqPosition == 1);
}
@@ -316,7 +316,7 @@ public class SequenceManager extends BasicManager {
* @return true or false
*/
public boolean isLastItem(String scoIdentifier) {
- ItemSequence anItem = (ItemSequence) _itemSequences.get(scoIdentifier);
+ ItemSequence anItem = _itemSequences.get(scoIdentifier);
int seqPosition = anItem.getSequence();
return (seqPosition == _itemSequences.size());
}