summaryrefslogtreecommitdiffstats
path: root/wizards
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-06-27 12:18:38 +0200
committerMichael Stahl <mstahl@redhat.com>2012-06-29 22:02:59 +0200
commit34643facd763f427b300590df90bdda5bfd26d61 (patch)
tree62c187d2bc213b6b300f84318a2890ba26b6ffaf /wizards
parentUpdating to Java5 - convert Vector to ArrayList (diff)
downloadcore-34643facd763f427b300590df90bdda5bfd26d61.tar.gz
core-34643facd763f427b300590df90bdda5bfd26d61.zip
Java5 update - convert Hashtable to HashMap
Change-Id: I4162dd0af7501013573590ee1a7a11fc1b36cc99
Diffstat (limited to 'wizards')
-rw-r--r--wizards/com/sun/star/wizards/agenda/AgendaTemplate.java8
-rw-r--r--wizards/com/sun/star/wizards/common/Properties.java2
-rw-r--r--wizards/com/sun/star/wizards/table/TableWizard.java6
-rw-r--r--wizards/com/sun/star/wizards/ui/UnoDialog.java8
-rw-r--r--wizards/com/sun/star/wizards/ui/event/AbstractListener.java4
-rw-r--r--wizards/com/sun/star/wizards/web/Process.java4
-rw-r--r--wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java4
-rw-r--r--wizards/com/sun/star/wizards/web/data/CGLayout.java4
-rw-r--r--wizards/com/sun/star/wizards/web/data/CGSettings.java4
9 files changed, 22 insertions, 22 deletions
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java
index b8eaccd6741e..963ea7feaf20 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java
+++ b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java
@@ -150,7 +150,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
* When an Item must be redrawn (because the user checked or uncheced it),
* the controller is retrieved from this Map, and a redraw is issued on this controller.
*/
- Map itemsMap = new Hashtable(11);
+ Map itemsMap = new HashMap(11);
/**
* A temporary variable used to list all items and map them.
*/
@@ -359,7 +359,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
*/
private void initItemsCache()
{
- itemsCache = new Hashtable(11);
+ itemsCache = new HashMap(11);
XMultiServiceFactory xmsf = UnoRuntime.queryInterface(XMultiServiceFactory.class, document);
// Headings
@@ -1175,7 +1175,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
{
Object t;
- Map topicItems = new Hashtable(4);
+ Map topicItems = new HashMap(4);
// This is the topics table. say hallo :-)
try
@@ -1198,7 +1198,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
* cell by cell, I check in this map to know
* if a cell contains a <*> or not.
*/
- Hashtable items = new Hashtable();
+ HashMap items = new HashMap();
XTextRange item;
Object cell;
diff --git a/wizards/com/sun/star/wizards/common/Properties.java b/wizards/com/sun/star/wizards/common/Properties.java
index e6e1a46738d7..e367cf4690ce 100644
--- a/wizards/com/sun/star/wizards/common/Properties.java
+++ b/wizards/com/sun/star/wizards/common/Properties.java
@@ -33,7 +33,7 @@ import java.util.*;
* When finished, call the getProperties() method to get an array of the set properties.
* @author rp
*/
-public class Properties extends Hashtable
+public class Properties extends HashMap
{
public static Object getPropertyValue(PropertyValue[] props, String propName)
diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java
index 7af66893146b..5a5166ab242e 100644
--- a/wizards/com/sun/star/wizards/table/TableWizard.java
+++ b/wizards/com/sun/star/wizards/table/TableWizard.java
@@ -17,7 +17,7 @@
*/
package com.sun.star.wizards.table;
-import java.util.Hashtable;
+import java.util.HashMap;
import com.sun.star.awt.TextEvent;
import com.sun.star.awt.VclWindowPeerAttribute;
@@ -45,7 +45,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener,
FieldFormatter curFieldFormatter;
PrimaryKeyHandler curPrimaryKeyHandler;
String sMsgWizardName = PropertyNames.EMPTY_STRING;
- public Hashtable fielditems;
+ public HashMap fielditems;
int wizardmode;
String tablename;
String serrToManyFields;
@@ -77,7 +77,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener,
218, Boolean.TRUE, "DialogTable", 102, 41, 1, new Short((short) 0), sTitle, 330
});
drawNaviBar();
- fielditems = new Hashtable();
+ fielditems = new HashMap();
//TODO if reportResouces cannot be gotten dispose officedocument
if (getTableResources())
{
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index 9b7fadf89cbe..a9bdc4fb1b74 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -36,7 +36,7 @@ import com.sun.star.wizards.common.Desktop;
import com.sun.star.wizards.common.Helper;
import com.sun.star.wizards.ui.event.*;
-import java.util.Hashtable;
+import java.util.HashMap;
public class UnoDialog implements EventNames
{
@@ -55,7 +55,7 @@ public class UnoDialog implements EventNames
public XInterface xUnoDialog;
public XPropertySet xPSetDlg;
public XVclWindowPeer xVclWindowPeer;
- public Hashtable ControlList;
+ public HashMap ControlList;
public Resource m_oResource;
public XWindowPeer xWindowPeer = null;
private PeerConfig m_oPeerConfig;
@@ -71,7 +71,7 @@ public class UnoDialog implements EventNames
try
{
this.xMSF = xMSF;
- ControlList = new Hashtable();
+ ControlList = new HashMap();
xDialogModel = (XInterface) xMSF.createInstance("com.sun.star.awt.UnoControlDialogModel");
XMultiPropertySet xMultiPSetDlg = UnoRuntime.queryInterface(XMultiPropertySet.class, xDialogModel);
xMultiPSetDlg.setPropertyValues(PropertyNames, PropertyValues);
@@ -95,7 +95,7 @@ public class UnoDialog implements EventNames
}
}
- public int getControlKey(Object EventObject, Hashtable ControlList)
+ public int getControlKey(Object EventObject, HashMap ControlList)
{
int iKey;
XControl xContrl = UnoRuntime.queryInterface(XControl.class, EventObject);
diff --git a/wizards/com/sun/star/wizards/ui/event/AbstractListener.java b/wizards/com/sun/star/wizards/ui/event/AbstractListener.java
index 9203b2d1aefd..df12e04ba765 100644
--- a/wizards/com/sun/star/wizards/ui/event/AbstractListener.java
+++ b/wizards/com/sun/star/wizards/ui/event/AbstractListener.java
@@ -24,7 +24,7 @@ import com.sun.star.wizards.common.Helper;
import com.sun.star.wizards.common.PropertyNames;
import java.lang.reflect.InvocationTargetException;
-import java.util.Hashtable;
+import java.util.HashMap;
/**
* This class is a base class for listener classes.
@@ -42,7 +42,7 @@ import java.util.Hashtable;
public class AbstractListener
{
- private Hashtable mHashtable = new Hashtable();
+ private HashMap mHashtable = new HashMap();
/** Creates a new instance of AbstractListener */
public AbstractListener()
diff --git a/wizards/com/sun/star/wizards/web/Process.java b/wizards/com/sun/star/wizards/web/Process.java
index 196ee574c940..89c763c60c09 100644
--- a/wizards/com/sun/star/wizards/web/Process.java
+++ b/wizards/com/sun/star/wizards/web/Process.java
@@ -20,7 +20,7 @@ package com.sun.star.wizards.web;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.util.Hashtable;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -100,7 +100,7 @@ public class Process implements WebWizardConst, ProcessErrors
* This is a cache for exporters, so I do not need to
* instanciate the same exporter more than once.
*/
- private Map exporters = new Hashtable(3);
+ private Map exporters = new HashMap(3);
private boolean result;
public Process(
diff --git a/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java b/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java
index 92447f704b82..6a50044ed310 100644
--- a/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java
+++ b/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java
@@ -17,7 +17,7 @@
*/
package com.sun.star.wizards.web;
-import java.util.Hashtable;
+import java.util.HashMap;
import java.util.Map;
import com.sun.star.wizards.common.IRenderer;
@@ -33,7 +33,7 @@ import com.sun.star.wizards.common.IRenderer;
public class ProcessStatusRenderer implements IRenderer, WebWizardConst
{
- Map strings = new Hashtable(12);
+ Map strings = new HashMap(12);
public ProcessStatusRenderer(WebWizardDialogResources res)
{
diff --git a/wizards/com/sun/star/wizards/web/data/CGLayout.java b/wizards/com/sun/star/wizards/web/data/CGLayout.java
index 7e64a6b012df..da76594e134d 100644
--- a/wizards/com/sun/star/wizards/web/data/CGLayout.java
+++ b/wizards/com/sun/star/wizards/web/data/CGLayout.java
@@ -18,7 +18,7 @@
package com.sun.star.wizards.web.data;
import com.sun.star.wizards.ui.UIConsts;
-import java.util.Hashtable;
+import java.util.HashMap;
import java.util.Map;
import javax.xml.transform.*;
@@ -37,7 +37,7 @@ public class CGLayout extends ConfigSetItem
private void createTemplates(XMultiServiceFactory xmsf) throws Exception
{
- templates = new Hashtable(3);
+ templates = new HashMap(3);
TransformerFactory tf = TransformerFactory.newInstance();
diff --git a/wizards/com/sun/star/wizards/web/data/CGSettings.java b/wizards/com/sun/star/wizards/web/data/CGSettings.java
index 4ac054c5989b..09764e8c42fd 100644
--- a/wizards/com/sun/star/wizards/web/data/CGSettings.java
+++ b/wizards/com/sun/star/wizards/web/data/CGSettings.java
@@ -24,7 +24,7 @@
package com.sun.star.wizards.web.data;
import java.util.ArrayList;
-import java.util.Hashtable;
+import java.util.HashMap;
import java.util.Map;
import com.sun.star.beans.PropertyValue;
@@ -63,7 +63,7 @@ public class CGSettings extends ConfigGroup
public ConfigSet savedSessions = new ConfigSet(CGSessionName.class);
public CGSession cp_DefaultSession = new CGSession();
public String cp_LastSavedSession;
- private Map exportersMap = new Hashtable();
+ private Map exportersMap = new HashMap();
private XMultiServiceFactory xmsf;
String[] resources;
public Formatter formatter;