mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-08 02:06:01 +02:00
Fix warning now that we move forward to 2.1
This commit is contained in:
parent
6e979f08d0
commit
2abea460ea
5 changed files with 7 additions and 12 deletions
|
@ -97,9 +97,6 @@ public class CElementImageProvider {
|
||||||
if (element instanceof ICElement) {
|
if (element instanceof ICElement) {
|
||||||
descriptor= getCImageDescriptor((ICElement) element, flags);
|
descriptor= getCImageDescriptor((ICElement) element, flags);
|
||||||
}
|
}
|
||||||
// if (descriptor == null && element instanceof ICFile) {
|
|
||||||
// element = ((ICFile)element).getFile();
|
|
||||||
// }
|
|
||||||
if (descriptor == null && element instanceof IAdaptable) {
|
if (descriptor == null && element instanceof IAdaptable) {
|
||||||
descriptor= getWorkbenchImageDescriptor((IAdaptable) element, flags);
|
descriptor= getWorkbenchImageDescriptor((IAdaptable) element, flags);
|
||||||
}
|
}
|
||||||
|
@ -113,9 +110,9 @@ public class CElementImageProvider {
|
||||||
return (flags & OVERLAY_ICONS) != 0;
|
return (flags & OVERLAY_ICONS) != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean useLightIcons(int flags) {
|
// private boolean useLightIcons(int flags) {
|
||||||
return (flags & LIGHT_TYPE_ICONS) != 0;
|
// return (flags & LIGHT_TYPE_ICONS) != 0;
|
||||||
}
|
// }
|
||||||
|
|
||||||
private boolean useSmallSize(int flags) {
|
private boolean useSmallSize(int flags) {
|
||||||
return (flags & SMALL_ICONS) != 0;
|
return (flags & SMALL_ICONS) != 0;
|
||||||
|
@ -313,4 +310,3 @@ public class CElementImageProvider {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -86,7 +86,7 @@ public abstract class SelectionStatusDialog extends SelectionDialog {
|
||||||
* @return the first element of the initial selection.
|
* @return the first element of the initial selection.
|
||||||
*/
|
*/
|
||||||
protected Object getPrimaryInitialSelection() {
|
protected Object getPrimaryInitialSelection() {
|
||||||
List result= getInitialSelections();
|
List result= getInitialElementSelections();
|
||||||
if (result == null || result.size() == 0)
|
if (result == null || result.size() == 0)
|
||||||
return null;
|
return null;
|
||||||
return result.get(0);
|
return result.get(0);
|
||||||
|
@ -124,7 +124,7 @@ public abstract class SelectionStatusDialog extends SelectionDialog {
|
||||||
fImage= image;
|
fImage= image;
|
||||||
}
|
}
|
||||||
protected void setInitialSelection(int position, Object element) {
|
protected void setInitialSelection(int position, Object element) {
|
||||||
List l= getInitialSelections();
|
List l= getInitialElementSelections();
|
||||||
l.set(position, element);
|
l.set(position, element);
|
||||||
fInitialSelectionSet= true;
|
fInitialSelectionSet= true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -164,7 +164,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener {
|
||||||
};
|
};
|
||||||
|
|
||||||
private IOpenable fOwner;
|
private IOpenable fOwner;
|
||||||
private IDocument fDocument;
|
IDocument fDocument;
|
||||||
private DocumentSetCommand fSetCmd= new DocumentSetCommand();
|
private DocumentSetCommand fSetCmd= new DocumentSetCommand();
|
||||||
private DocumentReplaceCommand fReplaceCmd= new DocumentReplaceCommand();
|
private DocumentReplaceCommand fReplaceCmd= new DocumentReplaceCommand();
|
||||||
|
|
||||||
|
|
|
@ -579,7 +579,7 @@ public class CEditorPreferencePage extends PreferencePage implements IWorkbenchP
|
||||||
|
|
||||||
|
|
||||||
String label= "Text &font:";
|
String label= "Text &font:";
|
||||||
addTextFontEditor(behaviorComposite, label, CEditor.PREFERENCE_FONT);
|
addTextFontEditor(behaviorComposite, label, JFaceResources.TEXT_FONT);
|
||||||
|
|
||||||
label= "Displayed &tab width:";
|
label= "Displayed &tab width:";
|
||||||
addTextField(behaviorComposite, label, CSourceViewerConfiguration.PREFERENCE_TAB_WIDTH, 2, 0, true);
|
addTextField(behaviorComposite, label, CSourceViewerConfiguration.PREFERENCE_TAB_WIDTH, 2, 0, true);
|
||||||
|
|
|
@ -9,7 +9,6 @@ import java.text.MessageFormat;
|
||||||
import java.util.MissingResourceException;
|
import java.util.MissingResourceException;
|
||||||
import java.util.ResourceBundle;
|
import java.util.ResourceBundle;
|
||||||
|
|
||||||
import org.eclipse.cdt.core.CCorePlugin;
|
|
||||||
import org.eclipse.cdt.core.model.CoreModel;
|
import org.eclipse.cdt.core.model.CoreModel;
|
||||||
import org.eclipse.cdt.core.model.ICElement;
|
import org.eclipse.cdt.core.model.ICElement;
|
||||||
import org.eclipse.cdt.internal.ui.BuildConsoleManager;
|
import org.eclipse.cdt.internal.ui.BuildConsoleManager;
|
||||||
|
|
Loading…
Add table
Reference in a new issue