This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 677a618 [NETBEANS-3011] - reduce the amount of redundant cast
warnings..
677a618 is described below
commit 677a618943aa4b88f905840a8812b6b94e10caab
Author: Brad Walker <bwal...@musings.com>
AuthorDate: Tue Aug 20 15:13:17 2019 -0600
[NETBEANS-3011] - reduce the amount of redundant cast warnings..
This work simply reduces the redundant cast warnings in the code base..
---
.../org/netbeans/modules/xml/catalog/CatalogPanel.java | 10 +++++-----
.../modules/xsl/transform/TransformPerformer.java | 16 ++++++++--------
.../core/network/proxy/mac/MacCoreFoundationLibrary.java | 2 +-
.../core/network/proxy/mac/MacNetworkProxyLibrary.java | 2 +-
.../proxy/windows/WindowsNetworkProxyLibrary.java | 2 +-
.../core.osgi/src/org/netbeans/core/osgi/Activator.java | 2 +-
.../org/netbeans/core/osgi/OSGiInstalledFileLocator.java | 2 +-
.../src/org/netbeans/core/osgi/OSGiRepository.java | 2 +-
.../netbeans/modules/keyring/mac/SecurityLibrary.java | 2 +-
.../org/netbeans/modules/keyring/win32/Win32Protect.java | 2 +-
.../modules/masterfs/watcher/macosx/OSXNotifier.java | 4 ++--
.../masterfs/watcher/windows/WindowsNotifier.java | 4 ++--
.../src/org/openide/actions/EditAction.java | 2 +-
.../src/org/openide/actions/MoveDownAction.java | 2 +-
.../src/org/openide/actions/MoveUpAction.java | 2 +-
.../src/org/openide/actions/NewAction.java | 2 +-
.../src/org/openide/actions/OpenAction.java | 2 +-
.../src/org/openide/actions/PrintAction.java | 2 +-
.../src/org/openide/actions/ReorderAction.java | 2 +-
.../src/org/openide/actions/ViewAction.java | 2 +-
.../openide.awt/src/org/openide/awt/ColorComboBox.java | 4 ++--
.../src/org/openide/explorer/ExplorerActions.java | 12 +++++-------
.../openide/filesystems/RecognizeInstanceFiles.java | 2 +-
.../src/org/openide/loaders/DataObject.java | 2 +-
.../src/org/openide/loaders/DataObjectPool.java | 2 +-
.../netbeans/modules/sampler/SamplesOutputStream.java | 2 +-
26 files changed, 44 insertions(+), 46 deletions(-)
diff --git
a/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogPanel.java
b/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogPanel.java
index 71c388f..b13be96 100644
--- a/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogPanel.java
+++ b/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogPanel.java
@@ -299,7 +299,7 @@ public class CatalogPanel extends TopComponent implements
ExplorerManager.Provid
// End of variables declaration//GEN-END:variables
static private DataObject getDOFromNode(Node n) {
- DataObject dobj = (DataObject) n.getLookup().lookup(DataObject.class);
+ DataObject dobj = n.getLookup().lookup(DataObject.class);
assert dobj != null : "DataObject for node " + n;
return dobj;
}
@@ -310,12 +310,12 @@ public class CatalogPanel extends TopComponent implements
ExplorerManager.Provid
folder = DataFolder.findFolder(getCatalogRoot());
} else {
// try if has a data folder (alert: leaf node can be a empty
folder)
- folder = (DataFolder) nodes
[0].getLookup().lookup(DataFolder.class);
+ folder = nodes [0].getLookup().lookup(DataFolder.class);
// if not this node then try its parent
if (folder == null && nodes [0].isLeaf()) {
Node parent = nodes [0].getParentNode();
- folder = (DataFolder)
parent.getLookup().lookup(DataFolder.class);
+ folder = parent.getLookup().lookup(DataFolder.class);
}
}
return folder;
@@ -386,7 +386,7 @@ public class CatalogPanel extends TopComponent implements
ExplorerManager.Provid
private int getNodePosition(Node n) {
Index supp = getIndexSupport(n);
- DataFolder df = (DataFolder)
n.getParentNode().getLookup().lookup(DataFolder.class);
+ DataFolder df = n.getParentNode().getLookup().lookup(DataFolder.class);
df.getNodeDelegate().getChildren().getNodes(true);
int pos = supp.indexOf(n);
@@ -400,7 +400,7 @@ public class CatalogPanel extends TopComponent implements
ExplorerManager.Provid
Node parent = n.getParentNode();
assert parent != null : "Node " + n + " has a parent.";
- Index index = (Index) parent.getLookup().lookup(Index.class);
+ Index index = parent.getLookup().lookup(Index.class);
assert index != null : "Node " + parent + " has Index cookie.";
return index;
diff --git
a/ide/xsl/src/org/netbeans/modules/xsl/transform/TransformPerformer.java
b/ide/xsl/src/org/netbeans/modules/xsl/transform/TransformPerformer.java
index 7bbdc4c..d9767ef 100644
--- a/ide/xsl/src/org/netbeans/modules/xsl/transform/TransformPerformer.java
+++ b/ide/xsl/src/org/netbeans/modules/xsl/transform/TransformPerformer.java
@@ -91,7 +91,7 @@ public class TransformPerformer {
private void saveBeforeTransformation (DataObject dObject){
if (dObject.isModified()){
SaveCookie save;
- save = (SaveCookie)dObject.getCookie(SaveCookie.class);
+ save = dObject.getCookie(SaveCookie.class);
if (save != null) {
try {
save.save();
@@ -116,9 +116,9 @@ public class TransformPerformer {
// automatically detect if one of selected nodes is
transformation
// in such case suppose that user want to it to transform
second file
- DataObject do1 = (DataObject)
nodes[0].getCookie(DataObject.class);
+ DataObject do1 = nodes[0].getCookie(DataObject.class);
boolean xslt1 = TransformUtil.isXSLTransformation(do1);
- DataObject do2 = (DataObject)
nodes[1].getCookie(DataObject.class);
+ DataObject do2 = nodes[1].getCookie(DataObject.class);
boolean xslt2 = TransformUtil.isXSLTransformation(do2);
// fix for issue #61608
@@ -136,29 +136,29 @@ public class TransformPerformer {
DataObject xmlDO;
DataObject xslDO;
if ( xslt1 ) {
- transformable = (TransformableCookie)
nodes[1].getCookie(TransformableCookie.class);
+ transformable =
nodes[1].getCookie(TransformableCookie.class);
xmlDO = do2;
xslDO = do1;
} else {
- transformable = (TransformableCookie)
nodes[0].getCookie(TransformableCookie.class);
+ transformable =
nodes[0].getCookie(TransformableCookie.class);
xmlDO = do1;
xslDO = do2;
}
DoublePerformer performer = new
DoublePerformer(transformable, xmlDO, xslDO);
performer.perform();
} else {
- TransformableCookie transformable1 = (TransformableCookie)
nodes[0].getCookie(TransformableCookie.class);
+ TransformableCookie transformable1 =
nodes[0].getCookie(TransformableCookie.class);
SinglePerformer performer = new
SinglePerformer(transformable1, do1, xslt1);
performer.setLastInBatch(false);
performer.perform();
- TransformableCookie transformable2 = (TransformableCookie)
nodes[1].getCookie(TransformableCookie.class);
+ TransformableCookie transformable2 =
nodes[1].getCookie(TransformableCookie.class);
performer = new SinglePerformer(transformable2, do2,
xslt2);
performer.perform();
}
} else { // nodes.length != 2
for ( int i = 0; i < nodes.length; i++ ) {
- DataObject dataObject = (DataObject)
nodes[i].getCookie(DataObject.class);
+ DataObject dataObject =
nodes[i].getCookie(DataObject.class);
// fix for issue #61608
saveBeforeTransformation(dataObject);
TransformableCookie transformable = null;
diff --git
a/platform/core.network/src/org/netbeans/core/network/proxy/mac/MacCoreFoundationLibrary.java
b/platform/core.network/src/org/netbeans/core/network/proxy/mac/MacCoreFoundationLibrary.java
index c6b13b9..c13f0c4 100644
---
a/platform/core.network/src/org/netbeans/core/network/proxy/mac/MacCoreFoundationLibrary.java
+++
b/platform/core.network/src/org/netbeans/core/network/proxy/mac/MacCoreFoundationLibrary.java
@@ -28,7 +28,7 @@ import com.sun.jna.Structure;
* @author lfischme
*/
public interface MacCoreFoundationLibrary extends Library {
- MacCoreFoundationLibrary LIBRARY = (MacCoreFoundationLibrary)
Native.loadLibrary("CoreFoundation", MacCoreFoundationLibrary.class);
+ MacCoreFoundationLibrary LIBRARY = Native.loadLibrary("CoreFoundation",
MacCoreFoundationLibrary.class);
public boolean CFDictionaryGetValueIfPresent(Pointer dictionary, Pointer
key, Pointer[] returnValue);
diff --git
a/platform/core.network/src/org/netbeans/core/network/proxy/mac/MacNetworkProxyLibrary.java
b/platform/core.network/src/org/netbeans/core/network/proxy/mac/MacNetworkProxyLibrary.java
index 08c3520..fb24578 100644
---
a/platform/core.network/src/org/netbeans/core/network/proxy/mac/MacNetworkProxyLibrary.java
+++
b/platform/core.network/src/org/netbeans/core/network/proxy/mac/MacNetworkProxyLibrary.java
@@ -27,7 +27,7 @@ import com.sun.jna.Pointer;
* @author lfischme
*/
public interface MacNetworkProxyLibrary extends Library {
- MacNetworkProxyLibrary LIBRARY = (MacNetworkProxyLibrary)
Native.loadLibrary("CoreServices", MacNetworkProxyLibrary.class);
+ MacNetworkProxyLibrary LIBRARY = Native.loadLibrary("CoreServices",
MacNetworkProxyLibrary.class);
public Pointer CFNetworkCopySystemProxySettings();
}
diff --git
a/platform/core.network/src/org/netbeans/core/network/proxy/windows/WindowsNetworkProxyLibrary.java
b/platform/core.network/src/org/netbeans/core/network/proxy/windows/WindowsNetworkProxyLibrary.java
index 875fa35..354153d 100644
---
a/platform/core.network/src/org/netbeans/core/network/proxy/windows/WindowsNetworkProxyLibrary.java
+++
b/platform/core.network/src/org/netbeans/core/network/proxy/windows/WindowsNetworkProxyLibrary.java
@@ -30,7 +30,7 @@ import java.util.List;
* @author lfischme
*/
public interface WindowsNetworkProxyLibrary extends Library {
- WindowsNetworkProxyLibrary LIBRARY = (WindowsNetworkProxyLibrary)
Native.loadLibrary("winhttp.dll", WindowsNetworkProxyLibrary.class);
+ WindowsNetworkProxyLibrary LIBRARY = Native.loadLibrary("winhttp.dll",
WindowsNetworkProxyLibrary.class);
public class ProxyConfig extends Structure {
diff --git a/platform/core.osgi/src/org/netbeans/core/osgi/Activator.java
b/platform/core.osgi/src/org/netbeans/core/osgi/Activator.java
index 1435d56..f3da86b 100644
--- a/platform/core.osgi/src/org/netbeans/core/osgi/Activator.java
+++ b/platform/core.osgi/src/org/netbeans/core/osgi/Activator.java
@@ -281,7 +281,7 @@ public class Activator implements BundleActivator,
SynchronousBundleListener {
// Won't work anyway, so don't even try.
return null;
}
- String respath = (String) b.getHeaders().get("OpenIDE-Module-Install");
+ String respath = b.getHeaders().get("OpenIDE-Module-Install");
if (respath != null) {
String fqn = respath.replaceFirst("[.]class$", "").replace('/',
'.');
try {
diff --git
a/platform/core.osgi/src/org/netbeans/core/osgi/OSGiInstalledFileLocator.java
b/platform/core.osgi/src/org/netbeans/core/osgi/OSGiInstalledFileLocator.java
index f25b1e1..bc3775d 100644
---
a/platform/core.osgi/src/org/netbeans/core/osgi/OSGiInstalledFileLocator.java
+++
b/platform/core.osgi/src/org/netbeans/core/osgi/OSGiInstalledFileLocator.java
@@ -107,7 +107,7 @@ class OSGiInstalledFileLocator extends InstalledFileLocator
{
continue;
}
// OK, this bundle seems to own the file. Unpack everything it
contains at once.
- String execFilesS = (String)
owner.getHeaders().get("NetBeans-Executable-Files");
+ String execFilesS =
owner.getHeaders().get("NetBeans-Executable-Files");
List<String> execFiles = execFilesS == null ?
Collections.<String>emptyList() : Arrays.asList(execFilesS.split(","));
try {
for (URL resource :
NbCollections.iterable(NbCollections.checkedEnumerationByFilter(owner.findEntries(FILES,
null, true), URL.class, true))) {
diff --git a/platform/core.osgi/src/org/netbeans/core/osgi/OSGiRepository.java
b/platform/core.osgi/src/org/netbeans/core/osgi/OSGiRepository.java
index 0b3f7a2..1f48e7c 100644
--- a/platform/core.osgi/src/org/netbeans/core/osgi/OSGiRepository.java
+++ b/platform/core.osgi/src/org/netbeans/core/osgi/OSGiRepository.java
@@ -71,7 +71,7 @@ class OSGiRepository extends Repository {
// Won't work anyway, so don't even try.
continue;
}
- String explicit = (String)
b.getHeaders().get("OpenIDE-Module-Layer");
+ String explicit = b.getHeaders().get("OpenIDE-Module-Layer");
if (explicit != null) {
String base, ext;
int idx = explicit.lastIndexOf('.'); // NOI18N
diff --git
a/platform/keyring.impl/src/org/netbeans/modules/keyring/mac/SecurityLibrary.java
b/platform/keyring.impl/src/org/netbeans/modules/keyring/mac/SecurityLibrary.java
index 1007590..aa9eb43 100644
---
a/platform/keyring.impl/src/org/netbeans/modules/keyring/mac/SecurityLibrary.java
+++
b/platform/keyring.impl/src/org/netbeans/modules/keyring/mac/SecurityLibrary.java
@@ -28,7 +28,7 @@ import com.sun.jna.Pointer;
*/
public interface SecurityLibrary extends Library {
- SecurityLibrary LIBRARY = (SecurityLibrary) Native.loadLibrary("Security",
SecurityLibrary.class);
+ SecurityLibrary LIBRARY = Native.loadLibrary("Security",
SecurityLibrary.class);
int SecKeychainAddGenericPassword(
Pointer keychain,
diff --git
a/platform/keyring.impl/src/org/netbeans/modules/keyring/win32/Win32Protect.java
b/platform/keyring.impl/src/org/netbeans/modules/keyring/win32/Win32Protect.java
index 307b822..672b8d0 100644
---
a/platform/keyring.impl/src/org/netbeans/modules/keyring/win32/Win32Protect.java
+++
b/platform/keyring.impl/src/org/netbeans/modules/keyring/win32/Win32Protect.java
@@ -110,7 +110,7 @@ public class Win32Protect implements EncryptionProvider {
public @Override void freshKeyring(boolean fresh) {}
public interface CryptLib extends StdCallLibrary {
- CryptLib INSTANCE = (CryptLib) Native.loadLibrary("Crypt32",
CryptLib.class); // NOI18N
+ CryptLib INSTANCE = Native.loadLibrary("Crypt32", CryptLib.class); //
NOI18N
/** @see <a
href="http://msdn.microsoft.com/en-us/library/aa380261(VS.85,printer).aspx">Reference</a>
*/
boolean CryptProtectData(
CryptIntegerBlob pDataIn,
diff --git
a/platform/masterfs.macosx/src/org/netbeans/modules/masterfs/watcher/macosx/OSXNotifier.java
b/platform/masterfs.macosx/src/org/netbeans/modules/masterfs/watcher/macosx/OSXNotifier.java
index ec09422..6d5d9bf 100644
---
a/platform/masterfs.macosx/src/org/netbeans/modules/masterfs/watcher/macosx/OSXNotifier.java
+++
b/platform/masterfs.macosx/src/org/netbeans/modules/masterfs/watcher/macosx/OSXNotifier.java
@@ -66,8 +66,8 @@ public final class OSXNotifier extends Notifier<Void> {
private static final String ALL_CHANGE = "ALL-CHANGE"; //xxx - shouldn't
be global in Notifier rather than using null?
public OSXNotifier() {
- cf = (CoreFoundation)
Native.loadLibrary("CoreFoundation",CoreFoundation.class); //NOI18N
- cs = (CoreServices)
Native.loadLibrary("CoreServices",CoreServices.class); //NOI18N
+ cf = Native.loadLibrary("CoreFoundation",CoreFoundation.class);
//NOI18N
+ cs = Native.loadLibrary("CoreServices",CoreServices.class);
//NOI18N
callback = new EventCallbackImpl();
events = new LinkedBlockingQueue<String>();
}
diff --git
a/platform/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java
b/platform/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java
index e68862c..4d914a7 100644
---
a/platform/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java
+++
b/platform/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java
@@ -244,7 +244,7 @@ public final class WindowsNotifier extends Notifier<Void> {
}
- final static Kernel32 KERNEL32 = (Kernel32) Native.loadLibrary("kernel32",
Kernel32.class,
+ final static Kernel32 KERNEL32 = Native.loadLibrary("kernel32",
Kernel32.class,
new HashMap() {{
put(Library.OPTION_TYPE_MAPPER, W32APITypeMapper.UNICODE);
put(Library.OPTION_FUNCTION_MAPPER,
W32APIFunctionMapper.UNICODE);
@@ -448,7 +448,7 @@ public final class WindowsNotifier extends Notifier<Void> {
KERNEL32.GetQueuedCompletionStatus(port, rcount, rkey, roverlap,
INFINITE);
synchronized (this) {
- return (FileInfo)handleMap.get(rkey.getValue());
+ return handleMap.get(rkey.getValue());
}
}
diff --git a/platform/openide.actions/src/org/openide/actions/EditAction.java
b/platform/openide.actions/src/org/openide/actions/EditAction.java
index 641d118..ba87e84 100644
--- a/platform/openide.actions/src/org/openide/actions/EditAction.java
+++ b/platform/openide.actions/src/org/openide/actions/EditAction.java
@@ -54,7 +54,7 @@ public class EditAction extends CookieAction {
protected void performAction(final Node[] activatedNodes) {
for (int i = 0; i < activatedNodes.length; i++) {
- EditCookie es = (EditCookie)
activatedNodes[i].getCookie(EditCookie.class);
+ EditCookie es = activatedNodes[i].getCookie(EditCookie.class);
if (es != null) {
es.edit();
diff --git
a/platform/openide.actions/src/org/openide/actions/MoveDownAction.java
b/platform/openide.actions/src/org/openide/actions/MoveDownAction.java
index c843367..f9a97cf 100644
--- a/platform/openide.actions/src/org/openide/actions/MoveDownAction.java
+++ b/platform/openide.actions/src/org/openide/actions/MoveDownAction.java
@@ -124,7 +124,7 @@ public final class MoveDownAction extends NodeAction {
return null;
}
- return (Index) parent.getCookie(Index.class);
+ return parent.getCookie(Index.class);
}
/** Listens to the ordering changes and enables/disables the
diff --git a/platform/openide.actions/src/org/openide/actions/MoveUpAction.java
b/platform/openide.actions/src/org/openide/actions/MoveUpAction.java
index 519b57e..f54aa3f 100644
--- a/platform/openide.actions/src/org/openide/actions/MoveUpAction.java
+++ b/platform/openide.actions/src/org/openide/actions/MoveUpAction.java
@@ -148,7 +148,7 @@ public final class MoveUpAction extends NodeAction {
return null;
}
- return (Index) parent.getCookie(Index.class);
+ return parent.getCookie(Index.class);
}
/** Listens to the ordering changes and enables/disables the
diff --git a/platform/openide.actions/src/org/openide/actions/NewAction.java
b/platform/openide.actions/src/org/openide/actions/NewAction.java
index 96ff04c..94e041a 100644
--- a/platform/openide.actions/src/org/openide/actions/NewAction.java
+++ b/platform/openide.actions/src/org/openide/actions/NewAction.java
@@ -215,7 +215,7 @@ public final class NewAction extends NodeAction {
Node[] arr;
if (lookup != null) {
- arr = (Node[]) lookup.lookupAll(Node.class).toArray(new
Node[0]);
+ arr = lookup.lookupAll(Node.class).toArray(new Node[0]);
} else {
arr =
WindowManager.getDefault().getRegistry().getCurrentNodes();
}
diff --git a/platform/openide.actions/src/org/openide/actions/OpenAction.java
b/platform/openide.actions/src/org/openide/actions/OpenAction.java
index 6098d44..16b378a 100644
--- a/platform/openide.actions/src/org/openide/actions/OpenAction.java
+++ b/platform/openide.actions/src/org/openide/actions/OpenAction.java
@@ -53,7 +53,7 @@ public class OpenAction extends CookieAction {
protected void performAction(final Node[] activatedNodes) {
for (int i = 0; i < activatedNodes.length; i++) {
- OpenCookie oc = (OpenCookie)
activatedNodes[i].getCookie(OpenCookie.class);
+ OpenCookie oc = activatedNodes[i].getCookie(OpenCookie.class);
if (oc != null) {
oc.open();
diff --git a/platform/openide.actions/src/org/openide/actions/PrintAction.java
b/platform/openide.actions/src/org/openide/actions/PrintAction.java
index 5e62ba8..e687add 100644
--- a/platform/openide.actions/src/org/openide/actions/PrintAction.java
+++ b/platform/openide.actions/src/org/openide/actions/PrintAction.java
@@ -42,7 +42,7 @@ public class PrintAction extends CookieAction {
protected void performAction(final Node[] activatedNodes) {
for (int i = 0; i < activatedNodes.length; i++) {
- PrintCookie pc = (PrintCookie)
activatedNodes[i].getCookie(PrintCookie.class);
+ PrintCookie pc = activatedNodes[i].getCookie(PrintCookie.class);
if (pc != null) {
pc.print();
diff --git
a/platform/openide.actions/src/org/openide/actions/ReorderAction.java
b/platform/openide.actions/src/org/openide/actions/ReorderAction.java
index bbbd7cb..4ec2bb9 100644
--- a/platform/openide.actions/src/org/openide/actions/ReorderAction.java
+++ b/platform/openide.actions/src/org/openide/actions/ReorderAction.java
@@ -53,7 +53,7 @@ public class ReorderAction extends CookieAction {
protected void performAction(Node[] activatedNodes) {
Node n = activatedNodes[0]; // we supposed that one node is activated
- Index order = (Index) n.getCookie(Index.class);
+ Index order = n.getCookie(Index.class);
order.reorder();
}
diff --git a/platform/openide.actions/src/org/openide/actions/ViewAction.java
b/platform/openide.actions/src/org/openide/actions/ViewAction.java
index 1d4f3a3..3474123 100644
--- a/platform/openide.actions/src/org/openide/actions/ViewAction.java
+++ b/platform/openide.actions/src/org/openide/actions/ViewAction.java
@@ -63,7 +63,7 @@ public class ViewAction extends CookieAction {
return;
}
for (int i = 0; i < activatedNodes.length; i++) {
- ViewCookie es = (ViewCookie)
activatedNodes[i].getCookie(ViewCookie.class);
+ ViewCookie es = activatedNodes[i].getCookie(ViewCookie.class);
if (es != null) {
es.view();
}
diff --git a/platform/openide.awt/src/org/openide/awt/ColorComboBox.java
b/platform/openide.awt/src/org/openide/awt/ColorComboBox.java
index e91fb79..fd3b1b3 100644
--- a/platform/openide.awt/src/org/openide/awt/ColorComboBox.java
+++ b/platform/openide.awt/src/org/openide/awt/ColorComboBox.java
@@ -165,7 +165,7 @@ public final class ColorComboBox extends JComboBox {
Color c = JColorChooser.showDialog(
SwingUtilities.getAncestorOfClass( Dialog.class, this ),
NbBundle.getMessage( ColorComboBox.class, "SelectColor" ),
//NOI18N
- lastSelection != null ? (( ColorValue ) lastSelection).color :
null );
+ lastSelection != null ? lastSelection.color : null );
if( c != null ) {
setSelectedColor( c );
} else if( lastSelection != null ) {
@@ -192,4 +192,4 @@ public final class ColorComboBox extends JComboBox {
}
return model;
}
-}
\ No newline at end of file
+}
diff --git
a/platform/openide.compat/src/org/openide/explorer/ExplorerActions.java
b/platform/openide.compat/src/org/openide/explorer/ExplorerActions.java
index 1b8b1f7..1b9c094 100644
--- a/platform/openide.compat/src/org/openide/explorer/ExplorerActions.java
+++ b/platform/openide.compat/src/org/openide/explorer/ExplorerActions.java
@@ -152,9 +152,7 @@ public class ExplorerActions {
if (c instanceof ExClipboard) {
ExClipboard clip = (ExClipboard) c;
clip.addClipboardListener(
- (ClipboardListener) org.openide.util.WeakListeners.create(
- ClipboardListener.class, actionStateUpdater, clip
- )
+ org.openide.util.WeakListeners.create(ClipboardListener.class,
actionStateUpdater, clip)
);
}
@@ -235,10 +233,10 @@ public class ExplorerActions {
Node[] path = manager.getSelectedNodes();
if (copy == null) {
- copy = (CopyAction) CopyAction.findObject(CopyAction.class, true);
- cut = (CutAction) CutAction.findObject(CutAction.class, true);
- paste = (PasteAction) PasteAction.findObject(PasteAction.class,
true);
- delete = (DeleteAction)
DeleteAction.findObject(DeleteAction.class, true);
+ copy = CopyAction.findObject(CopyAction.class, true);
+ cut = CutAction.findObject(CutAction.class, true);
+ paste = PasteAction.findObject(PasteAction.class, true);
+ delete = DeleteAction.findObject(DeleteAction.class, true);
}
int i;
diff --git
a/platform/openide.filesystems/src/org/netbeans/modules/openide/filesystems/RecognizeInstanceFiles.java
b/platform/openide.filesystems/src/org/netbeans/modules/openide/filesystems/RecognizeInstanceFiles.java
index 4f20c88..a63b873 100644
---
a/platform/openide.filesystems/src/org/netbeans/modules/openide/filesystems/RecognizeInstanceFiles.java
+++
b/platform/openide.filesystems/src/org/netbeans/modules/openide/filesystems/RecognizeInstanceFiles.java
@@ -203,7 +203,7 @@ public final class RecognizeInstanceFiles extends
NamedServicesProvider {
IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
T r = null;
for (CustomInstanceFactory fif : getInstanceFactories()) {
- r = (T)fif.createInstance(type);
+ r = fif.createInstance(type);
if (r != null) {
break;
}
diff --git a/platform/openide.loaders/src/org/openide/loaders/DataObject.java
b/platform/openide.loaders/src/org/openide/loaders/DataObject.java
index 1251ad4..db4e5be 100644
--- a/platform/openide.loaders/src/org/openide/loaders/DataObject.java
+++ b/platform/openide.loaders/src/org/openide/loaders/DataObject.java
@@ -1581,7 +1581,7 @@ implements Node.Cookie, Serializable, HelpCtx.Provider,
Lookup.Provider {
if (c == null || c.param == null) {
return Collections.emptyMap();
}
- return (Map<String, Object>)Collections.unmodifiableMap(c.param);
+ return Collections.unmodifiableMap(c.param);
}
static String getOrigName() {
diff --git
a/platform/openide.loaders/src/org/openide/loaders/DataObjectPool.java
b/platform/openide.loaders/src/org/openide/loaders/DataObjectPool.java
index 2ee9a86..f094237 100644
--- a/platform/openide.loaders/src/org/openide/loaders/DataObjectPool.java
+++ b/platform/openide.loaders/src/org/openide/loaders/DataObjectPool.java
@@ -686,7 +686,7 @@ implements ChangeListener {
}
// notify all in folder
for (int i = 0; i < siblings.length; i++) {
- itm = (Item)
DataObjectPool.POOL.map.get(siblings[i]);
+ itm = DataObjectPool.POOL.map.get(siblings[i]);
if (itm == null) {
continue;
}
diff --git
a/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java
b/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java
index d479fbc..3186fa1 100644
--- a/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java
+++ b/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java
@@ -249,7 +249,7 @@ class SamplesOutputStream {
out.writeLong(tid.longValue());
}
out.writeInt(newThreads.size());
- for (Object t : (Object[]) toCompositeData(newThreads)) {
+ for (Object t : toCompositeData(newThreads)) {
out.writeObject(t);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
