strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Java5 update - convert Hashtable to HashMap

Browse source 
Change-Id: I4162dd0af7501013573590ee1a7a11fc1b36cc99
This commit is contained in:
Noel Grandin 2012-06-27 12:18:38 +02:00 committed by Michael Stahl
parent 21e1b42f31
commit 34643facd7
9 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wizards/com/sun/star/wizards/agenda/AgendaTemplate.java
View file

@ -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;

2
wizards/com/sun/star/wizards/common/Properties.java
View file

@ -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)

6
wizards/com/sun/star/wizards/table/TableWizard.java
View file

@ -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())
{

8
wizards/com/sun/star/wizards/ui/UnoDialog.java
View file

@ -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);

4
wizards/com/sun/star/wizards/ui/event/AbstractListener.java
View file

@ -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()

4
wizards/com/sun/star/wizards/web/Process.java
View file

@ -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(

4
wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java
View file

@ -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)
{

4
wizards/com/sun/star/wizards/web/data/CGLayout.java
View file

@ -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();

4
wizards/com/sun/star/wizards/web/data/CGSettings.java
View file

@ -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;