diff options
author | Noel Grandin <noel@peralex.com> | 2012-06-27 12:15:34 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-06-29 22:02:58 +0200 |
commit | 21e1b42f3137ba98567cb4f61e95324b4c9acf64 (patch) | |
tree | 03d7264c3f3e9493a6396653e48f56af7baec4ce /wizards/com/sun/star/wizards/agenda | |
parent | b728bb537fb21c2bc890d4c5c90bd14cb35805e2 (diff) |
Updating to Java5 - convert Vector to ArrayList
Change-Id: I585312848dacf5128a64469874a1c65452a2b5c8
Diffstat (limited to 'wizards/com/sun/star/wizards/agenda')
3 files changed, 13 insertions, 13 deletions
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java index 82d5ec15e97b..b8eaccd6741e 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java +++ b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java @@ -154,7 +154,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data /** * A temporary variable used to list all items and map them. */ - List _allItems = new Vector(); + List _allItems = new ArrayList(); /** * keep a reference on some static items in the document, * so when their content is changed (through the user), we @@ -943,7 +943,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data /** * the items in the table. */ - List items = new Vector(6); + List items = new ArrayList(6); public ItemsTable(Object section_, Object table_) { @@ -1119,21 +1119,21 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data /** * A List of Cell Formatters for the first row. */ - List firstRowFormat = new Vector(); + List firstRowFormat = new ArrayList(); /** * A List of Cell Formatters for the last row. * (will contain them in reverse order) */ - List lastRowFormat = new Vector(); + List lastRowFormat = new ArrayList(); /** * the format of the cell of each topic cell. */ - List topicCellFormats = new Vector(); + List topicCellFormats = new ArrayList(); /** * for each topic cell there is * a member in this vector */ - List topicCells = new Vector(); + List topicCells = new ArrayList(); int rowsPerTopic; /** * fields which hold the number of the @@ -1151,7 +1151,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data * empty strings for topics which were written (though any other * object would also do - i check only if it is a null or not...); */ - List writtenTopics = new Vector(); + List writtenTopics = new ArrayList(); /** * Analyze the structure of the Topics table. diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java index 33bb00ec6790..52b053c1047e 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java +++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java @@ -18,7 +18,7 @@ package com.sun.star.wizards.agenda; -import java.util.Vector; +import java.util.ArrayList; import com.sun.star.awt.ItemEvent; import com.sun.star.awt.VclWindowPeerAttribute; @@ -37,16 +37,16 @@ import com.sun.star.util.XCloseable; import com.sun.star.wizards.common.Configuration; import com.sun.star.wizards.common.Desktop; import com.sun.star.wizards.common.FileAccess; +import com.sun.star.wizards.common.HelpIds; import com.sun.star.wizards.common.Helper; import com.sun.star.wizards.common.NoValidPathException; -import com.sun.star.wizards.common.SystemDialog; -import com.sun.star.wizards.common.HelpIds; import com.sun.star.wizards.common.PropertyNames; +import com.sun.star.wizards.common.SystemDialog; import com.sun.star.wizards.document.OfficeDocument; import com.sun.star.wizards.text.ViewHandler; import com.sun.star.wizards.ui.PathSelection; import com.sun.star.wizards.ui.XPathSelectionListener; -import com.sun.star.wizards.ui.event.DataAware; +import com.sun.star.wizards.ui.event.DataAware; import com.sun.star.wizards.ui.event.RadioDataAware; import com.sun.star.wizards.ui.event.UnoDataAware; @@ -131,7 +131,7 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog agendaTemplate = new AgendaTemplate(xMSF, agenda, resources, this); initializeTemplates(); - agendaTemplate.load(agendaTemplates[1][agenda.cp_AgendaType] , new Vector()); + agendaTemplate.load(agendaTemplates[1][agenda.cp_AgendaType] , new ArrayList()); // build the dialog. buildStep1(); diff --git a/wizards/com/sun/star/wizards/agenda/TopicsControl.java b/wizards/com/sun/star/wizards/agenda/TopicsControl.java index b34d53b05b91..3a2a10972565 100644 --- a/wizards/com/sun/star/wizards/agenda/TopicsControl.java +++ b/wizards/com/sun/star/wizards/agenda/TopicsControl.java @@ -496,7 +496,7 @@ public class TopicsControl extends ControlScroller implements XFocusListener protected void insertControlGroup(int _index, int npos) { ControlRow oControlRow = new ControlRow((AgendaWizardDialog) CurUnoDialog, iCompPosX, npos, _index, tabIndex); - ControlGroupVector.addElement(oControlRow); + ControlGroupVector.add(oControlRow); tabIndex += 4; } |