Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
e527a340
Kaydet (Commit)
e527a340
authored
May 03, 2013
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Java cleanup, convert more Vector to ArrayList
Change-Id: Icb807382eaf50f515f2c9dfada0c061414baed33
üst
587c59fb
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
64 additions
and
64 deletions
+64
-64
EmbedContApp.java
embeddedobj/test/Container1/EmbedContApp.java
+3
-3
Splitter.java
filter/source/config/tools/split/Splitter.java
+1
-1
SalesFilter.java
odk/examples/DevelopersGuide/Forms/SalesFilter.java
+5
-5
SubscribedNewsgroups.java
scripting/examples/java/Newsgroup/SubscribedNewsgroups.java
+4
-4
ParcelFolderSupport.java
.../netbeans/modules/office/actions/ParcelFolderSupport.java
+4
-4
AccessibleTreeHandler.java
toolkit/test/accessibility/AccessibleTreeHandler.java
+2
-2
NodeHandler.java
toolkit/test/accessibility/NodeHandler.java
+2
-2
CheckMemoryUsage.java
vcl/qa/complex/memCheck/CheckMemoryUsage.java
+2
-2
FileAccess.java
wizards/com/sun/star/wizards/common/FileAccess.java
+12
-12
JavaTools.java
wizards/com/sun/star/wizards/common/JavaTools.java
+5
-5
TypeInspector.java
wizards/com/sun/star/wizards/db/TypeInspector.java
+21
-21
FieldSelection.java
wizards/com/sun/star/wizards/ui/FieldSelection.java
+3
-3
No files found.
embeddedobj/test/Container1/EmbedContApp.java
Dosyayı görüntüle @
e527a340
...
...
@@ -174,7 +174,7 @@ public class EmbedContApp extends Applet
}
catch
(
Exception
e
)
{
System
.
exit
(
0
);
}
m_oActionsNumberLock
=
new
Object
();
m_aActionsList
=
new
Vector
();
m_aActionsList
=
new
ArrayList
();
m_oInHandlerLock
=
new
Object
();
m_oImageLock
=
new
Object
();
...
...
@@ -484,7 +484,7 @@ public class EmbedContApp extends Applet
{
for
(
int
nInd
=
0
;
nInd
<
m_aActionsList
.
size
();
nInd
++
)
{
ActionObject
aAction
=
(
ActionObject
)
m_aActionsList
.
get
(
nInd
);
ActionObject
aAction
=
m_aActionsList
.
get
(
nInd
);
if
(
aAction
!=
null
)
{
if
(
aAction
.
m_nID
==
DESTROY
)
...
...
@@ -784,7 +784,7 @@ public class EmbedContApp extends Applet
m_aActionsList
.
add
(
new
ActionObject
(
nActionID
,
sParam
)
);
else
{
ActionObject
aAction
=
(
ActionObject
)
m_aActionsList
.
get
(
nSize
-
1
);
ActionObject
aAction
=
m_aActionsList
.
get
(
nSize
-
1
);
if
(
aAction
!=
null
&&
aAction
.
m_nID
!=
DESTROY
)
m_aActionsList
.
add
(
new
ActionObject
(
nActionID
,
sParam
)
);
}
...
...
filter/source/config/tools/split/Splitter.java
Dosyayı görüntüle @
e527a340
...
...
@@ -81,7 +81,7 @@ public class Splitter
// generate all type fragments
m_aDataSet
.
m_aDebug
.
setGlobalInfo
(
"generate type fragments ..."
);
java
.
util
.
Vector
lNames
=
m_aDataSet
.
m_aCache
.
getItemNames
(
Cache
.
E_TYPE
);
java
.
util
.
ArrayList
lNames
=
m_aDataSet
.
m_aCache
.
getItemNames
(
Cache
.
E_TYPE
);
java
.
util
.
Enumeration
it
=
lNames
.
elements
();
while
(
it
.
hasMoreElements
())
generateXMLFragment
(
Cache
.
E_TYPE
,
(
java
.
lang
.
String
)
it
.
nextElement
(),
m_aDataSet
.
m_aFragmentDirTypes
);
...
...
odk/examples/DevelopersGuide/Forms/SalesFilter.java
Dosyayı görüntüle @
e527a340
...
...
@@ -57,13 +57,13 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis
private
boolean
m_bSettingDate
;
private
boolean
m_bAdjustingFilterList
;
private
short
m_nPreviousFilterIndex
;
private
java
.
util
.
Vector
m_aFilterDates
;
private
java
.
util
.
ArrayList
m_aFilterDates
;
/* ------------------------------------------------------------------ */
public
SalesFilter
(
DocumentHelper
aDocument
,
XPropertySet
xSalesForm
,
XPropertySet
xFilterListBox
,
XPropertySet
xManualFilterEdit
,
XPropertySet
xStartFilterButton
)
{
m_aFilterDates
=
new
java
.
util
.
Vector
();
m_aFilterDates
=
new
java
.
util
.
ArrayList
();
m_bSettingsDirty
=
false
;
m_bSettingDate
=
false
;
m_bAdjustingFilterList
=
false
;
...
...
@@ -311,7 +311,7 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis
m_aDocument
.
getCurrentView
().
grabControlFocus
(
m_xManualFilter
);
m_bSettingDate
=
true
;
Object
aSelectedDateLimit
=
m_aFilterDates
.
elementA
t
(
m_nPreviousFilterIndex
);
Object
aSelectedDateLimit
=
m_aFilterDates
.
ge
t
(
m_nPreviousFilterIndex
);
if
(
null
!=
aSelectedDateLimit
)
{
// translate this date into one the AWT Toolkit understands
...
...
@@ -374,7 +374,7 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis
{
if
(
!
isManualFilter
(
(
short
)
i
)
)
// do not compare with the manual filter
{
GregorianCalendar
aCheckCal
=
getCalendarObject
(
(
java
.
util
.
Date
)
m_aFilterDates
.
elementA
t
(
i
)
);
GregorianCalendar
aCheckCal
=
getCalendarObject
(
(
java
.
util
.
Date
)
m_aFilterDates
.
ge
t
(
i
)
);
if
(
equalDate
(
aDateCal
,
aCheckCal
)
)
return
(
short
)
i
;
}
...
...
@@ -386,7 +386,7 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis
// the first (and thus oldes) user defined item
aFilterItems
.
remove
(
6
);
// keep our date vector synchron
m_aFilterDates
.
remove
ElementAt
(
6
);
m_aFilterDates
.
remove
(
6
);
}
// add the current user defined filter
...
...
scripting/examples/java/Newsgroup/SubscribedNewsgroups.java
Dosyayı görüntüle @
e527a340
...
...
@@ -118,7 +118,7 @@ public class SubscribedNewsgroups {
}
//System.out.println("mailrc files found");
ArrayList
subscribed
=
new
ArrayList
();
ArrayList
<
NewsGroup
>
subscribed
=
new
ArrayList
<
NewsGroup
>
();
// Get the newsgroups in each mailrc file
for
(
int
i
=
0
;
i
<
allMailrcs
.
length
;
i
++
)
{
...
...
@@ -137,7 +137,7 @@ public class SubscribedNewsgroups {
// Copy all unique Newsgroups into the global array
allSubscribed
=
new
NewsGroup
[
subscribed
.
size
()
];
subscribed
.
copyInto
(
allSubscribed
);
subscribed
.
toArray
(
allSubscribed
);
// Test that at least one subscribed newsgroup has been found
if
(
allSubscribed
.
length
<
1
)
{
...
...
@@ -153,11 +153,11 @@ public class SubscribedNewsgroups {
// Tests if the NewsGroup object has already been listed by another mailrc file
private
static
boolean
listed
(
NewsGroup
newsgroup
,
Vector
uniqueSubscription
)
private
static
boolean
listed
(
NewsGroup
newsgroup
,
ArrayList
<
NewsGroup
>
uniqueSubscription
)
{
for
(
int
i
=
0
;
i
<
uniqueSubscription
.
size
();
i
++)
{
NewsGroup
tempGroup
=
(
NewsGroup
)
uniqueSubscription
.
elementAt
(
i
);
NewsGroup
tempGroup
=
uniqueSubscription
.
elementAt
(
i
);
// Test for duplication
if
(
newsgroup
.
getHostName
().
equalsIgnoreCase
(
tempGroup
.
getHostName
())
&&
newsgroup
.
getNewsgroupName
().
equalsIgnoreCase
(
tempGroup
.
getNewsgroupName
()
)
)
...
...
scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java
Dosyayı görüntüle @
e527a340
...
...
@@ -166,8 +166,8 @@ public class ParcelFolderSupport implements ParcelFolderCookie
File
contents
=
FileUtil
.
toFile
(
primary
.
getFileObject
(
ParcelZipper
.
CONTENTS_DIRNAME
));
Vector
classpath
=
getConfigureClasspath
();
classpath
.
add
Element
(
contents
.
getAbsolutePath
());
ArrayList
<
String
>
classpath
=
getConfigureClasspath
();
classpath
.
add
(
contents
.
getAbsolutePath
());
try
{
ParcelDescriptor
descriptor
=
getParcelDescriptor
();
...
...
@@ -210,8 +210,8 @@ public class ParcelFolderSupport implements ParcelFolderCookie
return
true
;
}
private
Vector
getConfigureClasspath
()
{
ArrayList
result
=
new
ArrayList
();
private
ArrayList
<
String
>
getConfigureClasspath
()
{
ArrayList
<
String
>
result
=
new
ArrayList
<
String
>
();
String
classpath
=
NbClassPath
.
createRepositoryPath
().
getClassPath
();
if
(
System
.
getProperty
(
"os.name"
).
startsWith
(
"Windows"
)
)
...
...
toolkit/test/accessibility/AccessibleTreeHandler.java
Dosyayı görüntüle @
e527a340
...
...
@@ -105,7 +105,7 @@ class AccessibleTreeHandler
if
((
nIndex
>=
0
)
||
(
nIndex
<=
maChildList
.
size
()))
{
aChild
=
NodeFactory
.
Instance
().
createDefaultNode
(
xChild
,
aParent
);
maChildList
.
insertElementAt
(
aChild
,
nIndex
);
maChildList
.
add
(
nIndex
,
aChild
);
}
}
}
...
...
@@ -121,7 +121,7 @@ class AccessibleTreeHandler
{
synchronized
(
maChildList
)
{
maChildList
.
set
ElementAt
(
null
,
0
);
maChildList
.
set
(
0
,
null
);
}
}
}
toolkit/test/accessibility/NodeHandler.java
Dosyayı görüntüle @
e527a340
...
...
@@ -76,7 +76,7 @@ abstract class NodeHandler
aChild
=
createChild
(
aParent
,
nIndex
);
if
(
aChild
==
null
)
aChild
=
new
StringNode
(
"could not create child"
,
aParent
);
maChildList
.
set
ElementAt
(
aChild
,
nIndex
);
maChildList
.
set
(
nIndex
,
aChild
);
}
return
aChild
;
}
...
...
@@ -99,7 +99,7 @@ abstract class NodeHandler
synchronized
(
maChildList
)
{
System
.
out
.
println
(
" removing child at position "
+
nIndex
+
": "
+
maChildList
.
elementA
t
(
nIndex
));
+
maChildList
.
ge
t
(
nIndex
));
maChildList
.
remove
(
nIndex
);
}
}
...
...
vcl/qa/complex/memCheck/CheckMemoryUsage.java
Dosyayı görüntüle @
e527a340
...
...
@@ -25,9 +25,9 @@ import java.io.File;
import
java.io.FileWriter
;
import
java.io.FilenameFilter
;
import
java.io.PrintWriter
;
import
java.util.ArrayList
;
import
java.util.Iterator
;
import
java.util.StringTokenizer
;
import
java.util.Vector
;
import
lib.TestParameters
;
...
...
@@ -156,7 +156,7 @@ public class CheckMemoryUsage /* extends ComplexTestCase */
// get the file extension, export filter connection
Iterator
<
String
>
keys
=
param
.
keySet
().
iterator
();
Vector
<
String
>
v
=
new
Vector
<
String
>();
ArrayList
<
String
>
v
=
new
ArrayList
<
String
>();
while
(
keys
.
hasNext
())
{
String
key
=
keys
.
next
();
...
...
wizards/com/sun/star/wizards/common/FileAccess.java
Dosyayı görüntüle @
e527a340
...
...
@@ -53,7 +53,7 @@ public class FileAccess
{
/**
*
*
* @param xMSF
* @param sPath
* @param sAddPath
...
...
@@ -497,7 +497,7 @@ public class FileAccess
* @param xMSF
* @param FilterName the prefix of the filename. a "-" is added to the prefix !
* @param FolderName the folder (URL) to look for files...
* @return an array with two array members. The first one, with document titles,
* @return an array with two array members. The first one, with document titles,
* the second with the corresponding URLs.
* @deprecated please use the getFolderTitles() with ArrayList
*/
...
...
@@ -506,8 +506,8 @@ public class FileAccess
String
[][]
LocLayoutFiles
=
new
String
[
2
][];
try
{
java
.
util
.
Vector
<
String
>
TitleVector
=
null
;
java
.
util
.
Vector
<
String
>
NameVector
=
null
;
java
.
util
.
ArrayList
<
String
>
TitleVector
=
null
;
java
.
util
.
ArrayList
<
String
>
NameVector
=
null
;
XInterface
xDocInterface
=
(
XInterface
)
xMSF
.
createInstance
(
"com.sun.star.document.DocumentProperties"
);
XDocumentProperties
xDocProps
=
UnoRuntime
.
queryInterface
(
XDocumentProperties
.
class
,
xDocInterface
);
...
...
@@ -517,8 +517,8 @@ public class FileAccess
String
[]
nameList
=
xSimpleFileAccess
.
getFolderContents
(
FolderName
,
false
);
TitleVector
=
new
java
.
util
.
Vector
<
String
>(
/*nameList.length*/
);
NameVector
=
new
java
.
util
.
Vector
<
String
>(
nameList
.
length
);
TitleVector
=
new
java
.
util
.
ArrayList
<
String
>(
/*nameList.length*/
);
NameVector
=
new
java
.
util
.
ArrayList
<
String
>(
nameList
.
length
);
FilterName
=
FilterName
==
null
||
FilterName
.
equals
(
PropertyNames
.
EMPTY_STRING
)
?
null
:
FilterName
+
"-"
;
...
...
@@ -531,15 +531,15 @@ public class FileAccess
if
(
FilterName
==
null
||
fileName
.
startsWith
(
FilterName
))
{
xDocProps
.
loadFromMedium
(
nameList
[
i
],
noArgs
);
NameVector
.
add
Element
(
nameList
[
i
]);
TitleVector
.
add
Element
(
xDocProps
.
getTitle
());
NameVector
.
add
(
nameList
[
i
]);
TitleVector
.
add
(
xDocProps
.
getTitle
());
}
}
String
[]
LocNameList
=
new
String
[
NameVector
.
size
()];
String
[]
LocTitleList
=
new
String
[
TitleVector
.
size
()];
NameVector
.
copyInto
(
LocNameList
);
TitleVector
.
copyInto
(
LocTitleList
);
NameVector
.
toArray
(
LocNameList
);
TitleVector
.
toArray
(
LocTitleList
);
LocLayoutFiles
[
1
]
=
LocNameList
;
LocLayoutFiles
[
0
]
=
LocTitleList
;
...
...
@@ -598,7 +598,7 @@ public class FileAccess
}
/**
*
*
* @param xMSF
* @param _sStartFilterName
* @param FolderNames
...
...
@@ -1050,7 +1050,7 @@ public class FileAccess
}
/**
* shortens a filename to a user displayable representation.
* shortens a filename to a user displayable representation.
* @param path
* @param maxLength
* @return
...
...
wizards/com/sun/star/wizards/common/JavaTools.java
Dosyayı görüntüle @
e527a340
...
...
@@ -92,11 +92,11 @@ public class JavaTools
/**converts a list of Integer values included in an Integer vector to a list of int values
*
*
*
* @param _aIntegerVector
* @return
*/
public
static
int
[]
IntegerTointList
(
Vector
<
Integer
>
_aIntegerVector
)
public
static
int
[]
IntegerTointList
(
java
.
util
.
List
<
Integer
>
_aIntegerVector
)
{
try
{
...
...
@@ -117,12 +117,12 @@ public class JavaTools
}
/**converts a list of Boolean values included in a Boolean vector to a list of boolean values
*
*
*
*
* @param _aBooleanVector
* @return
*/
public
static
boolean
[]
BooleanTobooleanList
(
Vector
<
Boolean
>
_aBooleanVector
)
public
static
boolean
[]
BooleanTobooleanList
(
java
.
util
.
List
<
Boolean
>
_aBooleanVector
)
{
try
{
...
...
wizards/com/sun/star/wizards/db/TypeInspector.java
Dosyayı görüntüle @
e527a340
...
...
@@ -17,7 +17,7 @@
*/
package
com
.
sun
.
star
.
wizards
.
db
;
import
java.util.
Vector
;
import
java.util.
ArrayList
;
import
com.sun.star.beans.XPropertySet
;
import
com.sun.star.sdbc.ColumnSearch
;
...
...
@@ -69,27 +69,27 @@ public class TypeInspector
try
{
xResultSet
=
_xResultSet
;
Vector
<
String
>
aTypeNameVector
=
new
Vector
<
String
>();
Vector
<
Integer
>
aTypeVector
=
new
Vector
<
Integer
>();
Vector
<
Integer
>
aNullableVector
=
new
Vector
<
Integer
>();
Vector
<
Boolean
>
aAutoIncrementVector
=
new
Vector
<
Boolean
>();
Vector
<
Integer
>
aPrecisionVector
=
new
Vector
<
Integer
>();
Vector
<
Integer
>
aMinScaleVector
=
new
Vector
<
Integer
>();
Vector
<
Integer
>
aMaxScaleVector
=
new
Vector
<
Integer
>();
Vector
<
Integer
>
aSearchableVector
=
new
Vector
<
Integer
>();
ArrayList
<
String
>
aTypeNameVector
=
new
ArrayList
<
String
>();
ArrayList
<
Integer
>
aTypeVector
=
new
ArrayList
<
Integer
>();
ArrayList
<
Integer
>
aNullableVector
=
new
ArrayList
<
Integer
>();
ArrayList
<
Boolean
>
aAutoIncrementVector
=
new
ArrayList
<
Boolean
>();
ArrayList
<
Integer
>
aPrecisionVector
=
new
ArrayList
<
Integer
>();
ArrayList
<
Integer
>
aMinScaleVector
=
new
ArrayList
<
Integer
>();
ArrayList
<
Integer
>
aMaxScaleVector
=
new
ArrayList
<
Integer
>();
ArrayList
<
Integer
>
aSearchableVector
=
new
ArrayList
<
Integer
>();
// Integer[] aIntegerDataTypes = null;
// XResultSet xResultSet = xDBMetaDagetTypeInfo();
XRow
xRow
=
UnoRuntime
.
queryInterface
(
XRow
.
class
,
xResultSet
);
while
(
xResultSet
.
next
())
{
aTypeNameVector
.
add
Element
(
xRow
.
getString
(
1
));
aTypeVector
.
add
Element
(
new
Integer
(
xRow
.
getShort
(
2
)));
aPrecisionVector
.
add
Element
(
new
Integer
(
xRow
.
getInt
(
3
)));
aNullableVector
.
add
Element
(
new
Integer
(
xRow
.
getShort
(
7
)));
aSearchableVector
.
add
Element
(
new
Integer
(
xRow
.
getShort
(
9
)));
aAutoIncrementVector
.
add
Element
(
Boolean
.
valueOf
(
xRow
.
getBoolean
(
12
)));
aMinScaleVector
.
add
Element
(
new
Integer
(
xRow
.
getShort
(
14
)));
aMaxScaleVector
.
add
Element
(
new
Integer
(
xRow
.
getShort
(
15
)));
aTypeNameVector
.
add
(
xRow
.
getString
(
1
));
aTypeVector
.
add
(
new
Integer
(
xRow
.
getShort
(
2
)));
aPrecisionVector
.
add
(
new
Integer
(
xRow
.
getInt
(
3
)));
aNullableVector
.
add
(
new
Integer
(
xRow
.
getShort
(
7
)));
aSearchableVector
.
add
(
new
Integer
(
xRow
.
getShort
(
9
)));
aAutoIncrementVector
.
add
(
Boolean
.
valueOf
(
xRow
.
getBoolean
(
12
)));
aMinScaleVector
.
add
(
new
Integer
(
xRow
.
getShort
(
14
)));
aMaxScaleVector
.
add
(
new
Integer
(
xRow
.
getShort
(
15
)));
}
sDataTypeNames
=
new
String
[
aTypeNameVector
.
size
()];
...
...
@@ -404,21 +404,21 @@ public class TypeInspector
return
(
getAutoIncrementIndex
(
_xColPropertySet
)
!=
INVALID
);
}
/** finds the first available DataType that can be used as a primary key in a table.
/** finds the first available DataType that can be used as a primary key in a table.
* @return The first datatype that also supports Autoincrmentation is taken according to the following list:
*1) INTEGER
*2) FLOAT
*3) REAL
*4) DOUBLE
*5) NUMERIC
*6) DECIMAL *
*6) DECIMAL *
* If no appropriate datatype is found ther first available numeric type after DataType.INTEGER
* according to the 'convertDataType' method is returned
*/
/**TODO the fallback order is the same as implemented in the method 'convertDataType'.
/**TODO the fallback order is the same as implemented in the method 'convertDataType'.
* It's not very elegant to have the same intelligence
* on several spots in the class!!
*
*
*/
public
TypeInfo
findAutomaticPrimaryKeyType
()
{
...
...
wizards/com/sun/star/wizards/ui/FieldSelection.java
Dosyayı görüntüle @
e527a340
...
...
@@ -604,17 +604,17 @@ public class FieldSelection
{
int
MaxOriginalCount
=
AllFieldNames
.
length
;
String
[]
SelList
=
xFieldsListBox
.
getItems
();
Vector
<
String
>
NewSourceVector
=
new
Vector
<
String
>();
ArrayList
<
String
>
NewSourceVector
=
new
ArrayList
<
String
>();
for
(
int
i
=
0
;
i
<
MaxOriginalCount
;
i
++)
{
SearchString
=
AllFieldNames
[
i
];
if
(
JavaTools
.
FieldInList
(
SelList
,
SearchString
)
!=
-
1
)
{
NewSourceVector
.
add
Element
(
SearchString
);
NewSourceVector
.
add
(
SearchString
);
}
else
if
(
JavaTools
.
FieldInList
(
OldSelFieldItems
,
SearchString
)
!=
-
1
)
{
NewSourceVector
.
add
Element
(
SearchString
);
NewSourceVector
.
add
(
SearchString
);
}
}
xFieldsListBox
.
removeItems
((
short
)
0
,
xFieldsListBox
.
getItemCount
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment