Bug 426683 - Fix compiler warnings in CTabFolder and SleakView
Change-Id: Ief6003bd7c7b7165562ea79350b6863e7435f605
Signed-off-by: Arun Thondapu <arunkumar.thondapu@in.ibm.com>
diff --git a/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/views/SleakView.java b/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/views/SleakView.java
index 12e4219..3963970 100644
--- a/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/views/SleakView.java
+++ b/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/views/SleakView.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2014 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,12 +10,9 @@
*******************************************************************************/
package org.eclipse.swt.tools.views;
-import java.io.*;
-
import org.eclipse.swt.*;
import org.eclipse.swt.tools.internal.*;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.internal.UIPlugin;
+import org.eclipse.swt.widgets.*;
import org.eclipse.ui.part.*;
/**
@@ -63,40 +60,5 @@
public void setFocus() {
parent.setFocus();
}
-
- private boolean extractOptions (String fileName) {
- FileOutputStream os = null;
- InputStream is = null;
- File file = new File(fileName);
- try {
- if (!file.exists ()) {
- is = Class.forName("org.eclipse.ui.internal.UIPlugin").getResourceAsStream ("/.options"); //$NON-NLS-1$
- if (is != null) {
- int read;
- byte [] buffer = new byte [4096];
- os = new FileOutputStream (fileName);
- while ((read = is.read (buffer)) != -1) {
- os.write(buffer, 0, read);
- }
- os.close ();
- is.close ();
- }
- }
- return true;
- } catch (Throwable e) {
- } finally {
- try {
- if (os != null)
- os.close();
- } catch (IOException e1) {
- }
- try {
- if (is != null)
- is.close();
- } catch (IOException e1) {
- }
- }
- return false;
- }
}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java
index 3563681..95d191b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2014 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -3756,12 +3756,6 @@
bounds.y = -bounds.y;
bounds.height -= 2*bounds.y - 1;
} else {
- Rectangle trim = renderer.computeTrim(CTabFolderRenderer.PART_BORDER, SWT.NONE, 0, 0, 0, 0);
- int borderRight = trim.width + trim.x;
- int borderLeft = -trim.x;
- int borderBottom = trim.height + trim.y;
- int borderTop = -trim.y;
- int origY = bounds.y + bounds.height;
bounds.height += height - (bounds.y + bounds.height);
bounds.y = -1;
}
