mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Java5 updates - update code to use generics

Browse Source 
This is all of the code I missed in my first set of patches.

Change-Id: I8c7c9e5ac28dc3c2f3ac062c806fbf0787c997bd
This commit is contained in:
Noel Grandin
2012-06-29 10:08:15 +02:00
committed by Michael Stahl
parent 531a052bdc
commit f9fa0dd66b
46 changed files with 244 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
View File

@@ -55,7 +55,7 @@ public class ParcelBrowseNode extends PropertySet
{
private ScriptProvider provider;
//private RootBrowseNode parent;
private Collection browsenodes;
private Collection<XBrowseNode> browsenodes;
private String name;
private ParcelContainer container;
private Parcel parcel;
@@ -134,7 +134,7 @@ public class ParcelBrowseNode extends PropertySet
if ( hasChildNodes() )
{
String[] names = parcel.getElementNames();
browsenodes = new ArrayList( names.length );
browsenodes = new ArrayList<XBrowseNode>( names.length );
for ( int index = 0; index < names.length; index++ )
{
@@ -153,7 +153,7 @@ public class ParcelBrowseNode extends PropertySet
LogUtils.DEBUG( LogUtils.getTrace( e ) );
return new XBrowseNode[0];
}
return (XBrowseNode[])browsenodes.toArray(new XBrowseNode[0]);
return browsenodes.toArray(new XBrowseNode[browsenodes.size()]);
}
public boolean hasChildNodes() {
@@ -245,7 +245,7 @@ public class ParcelBrowseNode extends PropertySet
if(browsenodes==null)
{
LogUtils.DEBUG("browsenodes null!!");
browsenodes = new ArrayList(4);
browsenodes = new ArrayList<XBrowseNode>(4);
}
browsenodes.add(sbn);
@@ -319,7 +319,7 @@ public class ParcelBrowseNode extends PropertySet
{
getChildNodes();
}
ScriptBrowseNode[] childNodes = (ScriptBrowseNode[])browsenodes.toArray(new ScriptBrowseNode[0]);
ScriptBrowseNode[] childNodes = browsenodes.toArray(new ScriptBrowseNode[browsenodes.size()]);
for ( int index = 0; index < childNodes.length; index++ )
{

8
scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
View File

@@ -47,7 +47,7 @@ public class ProviderBrowseNode extends PropertySet
implements XBrowseNode, XInvocation
{
protected ScriptProvider provider;
protected Collection browsenodes;
protected Collection<XBrowseNode> browsenodes;
protected String name;
protected ParcelContainer container;
protected Parcel parcel;
@@ -105,7 +105,7 @@ public class ProviderBrowseNode extends PropertySet
// needs initialisation?
LogUtils.DEBUG("** ProviderBrowseNode.getChildNodes(), container is " + container );
String[] parcels = container.getElementNames();
browsenodes = new ArrayList( parcels.length );
browsenodes = new ArrayList<XBrowseNode>( parcels.length );
for ( int index = 0; index < parcels.length; index++ )
{
try
@@ -133,7 +133,7 @@ public class ProviderBrowseNode extends PropertySet
LogUtils.DEBUG("*** No container available");
return new XBrowseNode[0];
}
return ( XBrowseNode[] )browsenodes.toArray( new XBrowseNode[0] );
return browsenodes.toArray( new XBrowseNode[browsenodes.size()] );
}
public boolean hasChildNodes() {
@@ -231,7 +231,7 @@ public class ProviderBrowseNode extends PropertySet
LogUtils.DEBUG("created parcel node ");
if ( browsenodes == null )
{
browsenodes = new ArrayList( 5 );
browsenodes = new ArrayList<XBrowseNode>( 5 );
}
browsenodes.add(parcel);