Refactor ThemeAdapter type hierarchy
Remove IThemeAdapter. This was a useless marker interface.
Rename AbstractThemeAdapter to ThemeAdapter. This is the super type of
all our theme adapter implementations. It replaces IThemeAdapter.
Change-Id: Icaf241e0fd0b27e966d3f8eada5b2242f6a40bb8
diff --git a/bundles/org.eclipse.rap.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/Grid.java b/bundles/org.eclipse.rap.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/Grid.java
index d8ea2b4..f5aadad 100644
--- a/bundles/org.eclipse.rap.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/Grid.java
+++ b/bundles/org.eclipse.rap.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/Grid.java
@@ -24,7 +24,7 @@
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
import org.eclipse.rap.rwt.internal.theme.CssBoxDimensions;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.events.TreeListener;
@@ -2967,7 +2967,7 @@
}
private GridThemeAdapter getThemeAdapter() {
- return ( GridThemeAdapter )getAdapter( IThemeAdapter.class );
+ return ( GridThemeAdapter )getAdapter( ThemeAdapter.class );
}
private static int checkStyle( int style ) {
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/theme/IThemeAdapter.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/theme/IThemeAdapter.java
deleted file mode 100644
index cc0737d..0000000
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/theme/IThemeAdapter.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2012 Innoopract Informationssysteme GmbH 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Innoopract Informationssysteme GmbH - initial API and implementation
- * EclipseSource - ongoing development
- ******************************************************************************/
-package org.eclipse.rap.rwt.internal.theme;
-
-
-/**
- * A theme adapter provides information about the current appearance of a widget
- * to enable the widget to perform size computations and to return the correct
- * results in getter methods.
- */
-public interface IThemeAdapter {
-
-}
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/theme/AbstractThemeAdapter.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/theme/ThemeAdapter.java
similarity index 97%
rename from bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/theme/AbstractThemeAdapter.java
rename to bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/theme/ThemeAdapter.java
index fd505f5..7fcfeb5 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/theme/AbstractThemeAdapter.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/theme/ThemeAdapter.java
@@ -23,11 +23,11 @@
/**
* Base class for theme adapters.
*/
-public abstract class AbstractThemeAdapter implements IThemeAdapter {
+public abstract class ThemeAdapter {
private final WidgetMatcher matcher;
- public AbstractThemeAdapter() {
+ public ThemeAdapter() {
matcher = new WidgetMatcher();
configureMatcher( matcher );
}
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/theme/ThemeAdapterManager.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/theme/ThemeAdapterManager.java
index 99ec240..a35f4b4 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/theme/ThemeAdapterManager.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/theme/ThemeAdapterManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2012 EclipseSource and others.
+ * Copyright (c) 2009, 2015 EclipseSource 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
@@ -23,23 +23,23 @@
public final class ThemeAdapterManager {
- private final Map<Class,IThemeAdapter> themeAdapters;
+ private final Map<Class,ThemeAdapter> themeAdapters;
public ThemeAdapterManager() {
- themeAdapters = new HashMap<Class, IThemeAdapter>();
+ themeAdapters = new HashMap<Class, ThemeAdapter>();
}
public void reset() {
themeAdapters.clear();
}
- public IThemeAdapter getThemeAdapter( Widget widget ) {
+ public ThemeAdapter getThemeAdapter( Widget widget ) {
Class widgetClass = widget.getClass();
- IThemeAdapter result;
+ ThemeAdapter result;
synchronized( themeAdapters ) {
result = themeAdapters.get( widgetClass );
if( result == null ) {
- IThemeAdapter adapter = findThemeAdapter( widgetClass );
+ ThemeAdapter adapter = findThemeAdapter( widgetClass );
themeAdapters.put( widgetClass, adapter );
result = adapter;
}
@@ -48,8 +48,8 @@
return result;
}
- private static IThemeAdapter findThemeAdapter( Class widgetClass ) {
- IThemeAdapter result = null;
+ private static ThemeAdapter findThemeAdapter( Class widgetClass ) {
+ ThemeAdapter result = null;
Class superClass = widgetClass;
while( !Object.class.equals( superClass ) && result == null ) {
result = loadThemeAdapter( superClass );
@@ -60,8 +60,8 @@
return result;
}
- private static IThemeAdapter loadThemeAdapter( Class clazz ) {
- IThemeAdapter result = null;
+ private static ThemeAdapter loadThemeAdapter( Class clazz ) {
+ ThemeAdapter result = null;
if( clazz == Control.class ) {
result = new ControlThemeAdapterImpl();
} else {
@@ -81,17 +81,17 @@
return result;
}
- private static IThemeAdapter loadThemeAdapter( String className, ClassLoader classLoader ) {
- IThemeAdapter result = null;
+ private static ThemeAdapter loadThemeAdapter( String className, ClassLoader classLoader ) {
+ ThemeAdapter result = null;
try {
- result = ( IThemeAdapter )ClassUtil.newInstance( classLoader, className );
+ result = ( ThemeAdapter )ClassUtil.newInstance( classLoader, className );
} catch( ClassInstantiationException cie ) {
// ignore, try to load from next package name variant
}
return result;
}
- private static void ensureThemeAdapterWasFound( Class widgetClass, IThemeAdapter result ) {
+ private static void ensureThemeAdapterWasFound( Class widgetClass, ThemeAdapter result ) {
if( result == null ) {
String msg = "Failed to obtain theme adapter for class: " + widgetClass.getName();
throw new ThemeManagerException( msg );
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/theme/ControlThemeAdapter.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/theme/ControlThemeAdapter.java
index e5df4fe..a7d9c2c 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/theme/ControlThemeAdapter.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/theme/ControlThemeAdapter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2014 Innoopract Informationssysteme GmbH.
+ * Copyright (c) 2007, 2015 Innoopract Informationssysteme GmbH.
* 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
@@ -11,7 +11,6 @@
******************************************************************************/
package org.eclipse.rap.rwt.theme;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Rectangle;
@@ -25,7 +24,7 @@
*
* @since 2.0
*/
-public interface ControlThemeAdapter extends IThemeAdapter {
+public interface ControlThemeAdapter {
/**
* Returns the border of the specified control.
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/widgets/FileUpload.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/widgets/FileUpload.java
index 7ee2017..c6dba57 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/widgets/FileUpload.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/widgets/FileUpload.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2014 EclipseSource and others.
+ * Copyright (c) 2011, 2015 EclipseSource 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
@@ -11,7 +11,7 @@
package org.eclipse.rap.rwt.widgets;
import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.rap.rwt.internal.widgets.IFileUploadAdapter;
import org.eclipse.rap.rwt.internal.widgets.fileuploadkit.FileUploadThemeAdapter;
import org.eclipse.swt.SWT;
@@ -364,7 +364,7 @@
}
private FileUploadThemeAdapter getThemeAdapter() {
- return ( FileUploadThemeAdapter )getAdapter( IThemeAdapter.class );
+ return ( FileUploadThemeAdapter )getAdapter( ThemeAdapter.class );
}
////////////////
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/custom/CCombo.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/custom/CCombo.java
index 09684bd..8222526 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/custom/CCombo.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/custom/CCombo.java
@@ -12,7 +12,7 @@
import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
import org.eclipse.rap.rwt.internal.theme.CssBoxDimensions;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.events.ModifyListener;
@@ -1154,7 +1154,7 @@
}
private CComboThemeAdapter getThemeAdapter() {
- return ( CComboThemeAdapter )getAdapter( IThemeAdapter.class );
+ return ( CComboThemeAdapter )getAdapter( ThemeAdapter.class );
}
private static int checkStyle( int style ) {
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/custom/CLabel.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/custom/CLabel.java
index 9da5b17..c5b7d70 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/custom/CLabel.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/custom/CLabel.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2014 Innoopract Informationssysteme GmbH and others.
+ * Copyright (c) 2007, 2015 Innoopract Informationssysteme GmbH 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
@@ -17,7 +17,7 @@
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.events.DisposeEvent;
@@ -693,6 +693,6 @@
}
private CLabelThemeAdapter getCLabelThemeAdapter() {
- return ( CLabelThemeAdapter )getAdapter( IThemeAdapter.class );
+ return ( CLabelThemeAdapter )getAdapter( ThemeAdapter.class );
}
}
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/custom/CTabFolder.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/custom/CTabFolder.java
index c1165b8..cf68faf 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/custom/CTabFolder.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/custom/CTabFolder.java
@@ -13,7 +13,7 @@
import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
import org.eclipse.rap.rwt.internal.theme.CssBoxDimensions;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.events.ControlAdapter;
@@ -1070,7 +1070,7 @@
Color result = selectionBackground;
if( result == null ) {
CTabFolderThemeAdapter themeAdapter
- = ( CTabFolderThemeAdapter )getAdapter( IThemeAdapter.class );
+ = ( CTabFolderThemeAdapter )getAdapter( ThemeAdapter.class );
result = themeAdapter.getSelectedBackground( this );
}
if( result == null ) {
@@ -1238,7 +1238,7 @@
Color result = selectionForeground;
if( result == null ) {
CTabFolderThemeAdapter themeAdapter
- = ( CTabFolderThemeAdapter )getAdapter( IThemeAdapter.class );
+ = ( CTabFolderThemeAdapter )getAdapter( ThemeAdapter.class );
result = themeAdapter.getSelectedForeground( this );
}
if( result == null ) {
@@ -2325,19 +2325,19 @@
CssBoxDimensions getItemPadding( boolean selected ) {
CTabFolderThemeAdapter themeAdapter
- = ( CTabFolderThemeAdapter )getAdapter( IThemeAdapter.class );
+ = ( CTabFolderThemeAdapter )getAdapter( ThemeAdapter.class );
return themeAdapter.getItemPadding( selected );
}
int getItemSpacing( boolean selected ) {
CTabFolderThemeAdapter themeAdapter
- = ( CTabFolderThemeAdapter )getAdapter( IThemeAdapter.class );
+ = ( CTabFolderThemeAdapter )getAdapter( ThemeAdapter.class );
return themeAdapter.getItemSpacing( selected );
}
Font getItemFont( boolean selected ) {
CTabFolderThemeAdapter themeAdapter
- = ( CTabFolderThemeAdapter )getAdapter( IThemeAdapter.class );
+ = ( CTabFolderThemeAdapter )getAdapter( ThemeAdapter.class );
return themeAdapter.getItemFont( selected );
}
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Button.java
index 6177fae..6fddd37 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Button.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Button.java
@@ -17,7 +17,7 @@
import static org.eclipse.swt.internal.widgets.MarkupValidator.isValidationDisabledFor;
import org.eclipse.rap.rwt.RWT;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.events.SelectionEvent;
@@ -561,7 +561,7 @@
}
private ButtonThemeAdapter getThemeAdapter() {
- return ( ButtonThemeAdapter )getAdapter( IThemeAdapter.class );
+ return ( ButtonThemeAdapter )getAdapter( ThemeAdapter.class );
}
}
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Combo.java
index 609919a..7a283b7 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Combo.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Combo.java
@@ -13,7 +13,7 @@
import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
import org.eclipse.rap.rwt.internal.theme.CssBoxDimensions;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.events.ModifyListener;
@@ -1152,12 +1152,12 @@
}
private CssBoxDimensions getFieldPadding() {
- ComboThemeAdapter adapter = ( ComboThemeAdapter )getAdapter( IThemeAdapter.class );
+ ComboThemeAdapter adapter = ( ComboThemeAdapter )getAdapter( ThemeAdapter.class );
return adapter.getFieldPadding( this );
}
private int getButtonWidth() {
- ComboThemeAdapter adapter = ( ComboThemeAdapter )getAdapter( IThemeAdapter.class );
+ ComboThemeAdapter adapter = ( ComboThemeAdapter )getAdapter( ThemeAdapter.class );
return adapter.getButtonWidth( this );
}
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Control.java
index caadb75..c066f56 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Control.java
@@ -15,7 +15,7 @@
import static org.eclipse.swt.internal.widgets.MarkupValidator.isValidationDisabledFor;
import org.eclipse.rap.rwt.RWT;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.rap.rwt.theme.ControlThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
@@ -1482,7 +1482,7 @@
}
result = ( T )controlAdapter;
} else if( adapter == ControlThemeAdapter.class ) {
- result = ( T )super.getAdapter( IThemeAdapter.class );
+ result = ( T )super.getAdapter( ThemeAdapter.class );
} else {
result = super.getAdapter( adapter );
}
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/DateTime.java
index cd5747d..0f5fe42 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/DateTime.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/DateTime.java
@@ -21,7 +21,7 @@
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
import org.eclipse.rap.rwt.internal.theme.CssBoxDimensions;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.events.SelectionEvent;
@@ -954,7 +954,7 @@
}
private DateTimeThemeAdapter getDateTimeThemeAdapter() {
- return ( DateTimeThemeAdapter )getAdapter( IThemeAdapter.class );
+ return ( DateTimeThemeAdapter )getAdapter( ThemeAdapter.class );
}
private int getDropDownButtonWidth() {
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ExpandItem.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ExpandItem.java
index 8d45ce7..cfceeb5 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ExpandItem.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ExpandItem.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2014 Innoopract Informationssysteme GmbH and others.
+ * Copyright (c) 2008, 2015 Innoopract Informationssysteme GmbH 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
@@ -13,7 +13,7 @@
package org.eclipse.swt.widgets;
import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.graphics.Font;
@@ -432,7 +432,7 @@
}
private ExpandBarThemeAdapter getExpandBarThemeAdapter() {
- return ( ExpandBarThemeAdapter )parent.getAdapter( IThemeAdapter.class );
+ return ( ExpandBarThemeAdapter )parent.getAdapter( ThemeAdapter.class );
}
}
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Group.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Group.java
index a79ec3e..3d45ffb 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Group.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Group.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2014 Innoopract Informationssysteme GmbH and others.
+ * Copyright (c) 2002, 2015 Innoopract Informationssysteme GmbH 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
@@ -12,7 +12,7 @@
package org.eclipse.swt.widgets;
import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.graphics.Font;
@@ -141,7 +141,7 @@
public Rectangle getClientArea() {
checkWidget();
Rectangle bounds = getBounds();
- GroupThemeAdapter themeAdapter = ( GroupThemeAdapter )getAdapter( IThemeAdapter.class );
+ GroupThemeAdapter themeAdapter = ( GroupThemeAdapter )getAdapter( ThemeAdapter.class );
Rectangle trimmings = themeAdapter.getTrimmingSize( this );
Rectangle border = getBorder();
int width = Math.max( 0, bounds.width - trimmings.width - border.width );
@@ -152,7 +152,7 @@
@Override
public Rectangle computeTrim( int x, int y, int width, int height ) {
GroupThemeAdapter themeAdapter
- = ( GroupThemeAdapter )getAdapter( IThemeAdapter.class );
+ = ( GroupThemeAdapter )getAdapter( ThemeAdapter.class );
Rectangle trimmings = themeAdapter.getTrimmingSize( this );
Rectangle border = getBorder();
return super.computeTrim( x - trimmings.x - border.x,
@@ -169,7 +169,7 @@
if( length != 0 ) {
Font font = getFont();
Point stringExtent = TextSizeUtil.stringExtent( font, text );
- GroupThemeAdapter themeAdapter = ( GroupThemeAdapter )getAdapter( IThemeAdapter.class );
+ GroupThemeAdapter themeAdapter = ( GroupThemeAdapter )getAdapter( ThemeAdapter.class );
Rectangle headTrimmings = themeAdapter.getHeaderTrimmingSize( this );
int headerWidth = stringExtent.x + headTrimmings.width;
result.x = Math.max( result.x, headerWidth );
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Label.java
index a6001ad..49c5ed9 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Label.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Label.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2014 Innoopract Informationssysteme GmbH and others.
+ * Copyright (c) 2002, 2015 Innoopract Informationssysteme GmbH 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
@@ -17,7 +17,7 @@
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.graphics.Image;
@@ -341,7 +341,7 @@
}
private int getSeparatorLineWidth() {
- LabelThemeAdapter themeAdapter = ( LabelThemeAdapter )getAdapter( IThemeAdapter.class );
+ LabelThemeAdapter themeAdapter = ( LabelThemeAdapter )getAdapter( ThemeAdapter.class );
return themeAdapter.getSeparatorLineWidth( this );
}
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/List.java
index d77c3aa..c271354 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/List.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/List.java
@@ -18,7 +18,7 @@
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
import org.eclipse.rap.rwt.internal.theme.CssBoxDimensions;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.events.ControlAdapter;
@@ -1205,7 +1205,7 @@
private CssBoxDimensions getItemPadding() {
if( bufferedItemPadding == null ) {
- ListThemeAdapter themeAdapter = ( ListThemeAdapter )getAdapter( IThemeAdapter.class );
+ ListThemeAdapter themeAdapter = ( ListThemeAdapter )getAdapter( ThemeAdapter.class );
bufferedItemPadding = themeAdapter.getItemPadding( this );
}
return bufferedItemPadding;
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ProgressBar.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ProgressBar.java
index 5fec136..63d8011 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ProgressBar.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ProgressBar.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2014 Innoopract Informationssysteme GmbH and others.
+ * Copyright (c) 2002, 2015 Innoopract Informationssysteme GmbH 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
@@ -11,7 +11,7 @@
******************************************************************************/
package org.eclipse.swt.widgets;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.graphics.Point;
@@ -281,7 +281,7 @@
}
private int getProgressBarWidth() {
- IThemeAdapter themeAdapter = getAdapter( IThemeAdapter.class );
+ ThemeAdapter themeAdapter = getAdapter( ThemeAdapter.class );
return ( ( ProgressBarThemeAdapter )themeAdapter ).getProgressBarWidth( this );
}
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ScrollBar.java
index 2291941..026d8d6 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ScrollBar.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ScrollBar.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2014 Innoopract Informationssysteme GmbH.
+ * Copyright (c) 2002, 2015 Innoopract Informationssysteme GmbH.
* 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
@@ -15,7 +15,7 @@
import org.eclipse.rap.rwt.internal.lifecycle.WidgetUtil;
import org.eclipse.rap.rwt.internal.remote.RemoteObjectImpl;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.rap.rwt.remote.RemoteObject;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
@@ -546,7 +546,7 @@
}
private int getScrollBarWidth() {
- ScrollBarThemeAdapter themeAdapter = ( ScrollBarThemeAdapter )getAdapter( IThemeAdapter.class );
+ ScrollBarThemeAdapter themeAdapter = ( ScrollBarThemeAdapter )getAdapter( ThemeAdapter.class );
return themeAdapter.getScrollBarWidth( this );
}
}
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Shell.java
index 04afca2..b76c4c6 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Shell.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Shell.java
@@ -14,7 +14,7 @@
import org.eclipse.rap.rwt.internal.lifecycle.ProcessActionRunner;
import org.eclipse.rap.rwt.internal.theme.CssBoxDimensions;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.events.ShellListener;
@@ -571,7 +571,7 @@
private int getTitleBarHeight() {
int result = 0;
if( !getFullScreen() ) {
- ShellThemeAdapter themeAdapter = ( ShellThemeAdapter )getAdapter( IThemeAdapter.class );
+ ShellThemeAdapter themeAdapter = ( ShellThemeAdapter )getAdapter( ThemeAdapter.class );
result = themeAdapter.getTitleBarHeight( this );
}
return result;
@@ -579,14 +579,14 @@
private CssBoxDimensions getTitleBarMargin() {
if( !getFullScreen() ) {
- ShellThemeAdapter themeAdapter = ( ShellThemeAdapter )getAdapter( IThemeAdapter.class );
+ ShellThemeAdapter themeAdapter = ( ShellThemeAdapter )getAdapter( ThemeAdapter.class );
return themeAdapter.getTitleBarMargin( this );
}
return CssBoxDimensions.ZERO;
}
private int getMenuBarHeight() {
- ShellThemeAdapter themeAdapter = ( ShellThemeAdapter )getAdapter( IThemeAdapter.class );
+ ShellThemeAdapter themeAdapter = ( ShellThemeAdapter )getAdapter( ThemeAdapter.class );
return themeAdapter.getMenuBarHeight( this );
}
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Spinner.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Spinner.java
index ee32e7d..2f45ee7 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Spinner.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Spinner.java
@@ -16,7 +16,7 @@
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
import org.eclipse.rap.rwt.internal.theme.CssBoxDimensions;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.events.ModifyListener;
@@ -650,12 +650,12 @@
// Helping methods
private CssBoxDimensions getFieldPadding() {
- SpinnerThemeAdapter themeAdapter = ( SpinnerThemeAdapter )getAdapter( IThemeAdapter.class );
+ SpinnerThemeAdapter themeAdapter = ( SpinnerThemeAdapter )getAdapter( ThemeAdapter.class );
return themeAdapter.getFieldPadding( this );
}
private int getButtonWidth() {
- SpinnerThemeAdapter themeAdapter = ( SpinnerThemeAdapter )getAdapter( IThemeAdapter.class );
+ SpinnerThemeAdapter themeAdapter = ( SpinnerThemeAdapter )getAdapter( ThemeAdapter.class );
return themeAdapter.getButtonWidth( this );
}
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/TabFolder.java
index 87266c7..c04fb38 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/TabFolder.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/TabFolder.java
@@ -12,7 +12,7 @@
package org.eclipse.swt.widgets;
import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.events.SelectionEvent;
@@ -598,7 +598,7 @@
}
TabFolderThemeAdapter getThemeAdapter() {
- return ( TabFolderThemeAdapter )getAdapter( IThemeAdapter.class );
+ return ( TabFolderThemeAdapter )getAdapter( ThemeAdapter.class );
}
@Override
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Table.java
index 7975361..dbf6740 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Table.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Table.java
@@ -20,7 +20,7 @@
import org.eclipse.rap.rwt.internal.lifecycle.ProcessActionRunner;
import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
import org.eclipse.rap.rwt.internal.theme.CssBoxDimensions;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.rap.rwt.template.Template;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
@@ -140,7 +140,7 @@
}
public int getCheckWidth() {
- TableThemeAdapter themeAdapter = ( TableThemeAdapter )getAdapter( IThemeAdapter.class );
+ TableThemeAdapter themeAdapter = ( TableThemeAdapter )getAdapter( ThemeAdapter.class );
return themeAdapter.getCheckBoxImageSize( Table.this ).x;
}
@@ -1900,7 +1900,7 @@
}
}
result = Math.max( textHeight, imageHeight );
- TableThemeAdapter themeAdapter = ( TableThemeAdapter )getAdapter( IThemeAdapter.class );
+ TableThemeAdapter themeAdapter = ( TableThemeAdapter )getAdapter( ThemeAdapter.class );
result += themeAdapter.getHeaderBorderBottomWidth( this );
result += themeAdapter.getHeaderPadding( this ).getHeight();
}
@@ -2388,7 +2388,7 @@
CssBoxDimensions getCellPadding() {
if( bufferedCellPadding == null ) {
- TableThemeAdapter themeAdapter = ( TableThemeAdapter )getAdapter( IThemeAdapter.class );
+ TableThemeAdapter themeAdapter = ( TableThemeAdapter )getAdapter( ThemeAdapter.class );
bufferedCellPadding = themeAdapter.getCellPadding( this );
}
return bufferedCellPadding;
@@ -2396,7 +2396,7 @@
int getCellSpacing() {
if( bufferedCellSpacing < 0 ) {
- TableThemeAdapter themeAdapter = ( TableThemeAdapter )getAdapter( IThemeAdapter.class );
+ TableThemeAdapter themeAdapter = ( TableThemeAdapter )getAdapter( ThemeAdapter.class );
bufferedCellSpacing = themeAdapter.getCellSpacing( parent );
}
return bufferedCellSpacing;
@@ -2476,7 +2476,7 @@
final Point getCheckSize() {
Point result = new Point( 0, 0 );
if( ( style & SWT.CHECK ) != 0 ) {
- TableThemeAdapter themeAdapter = ( TableThemeAdapter )getAdapter( IThemeAdapter.class );
+ TableThemeAdapter themeAdapter = ( TableThemeAdapter )getAdapter( ThemeAdapter.class );
Point checkImageSize = themeAdapter.getCheckBoxImageSize( this );
CssBoxDimensions margin = getCheckBoxMargin();
result.x = checkImageSize.x + margin.getWidth();
@@ -2486,7 +2486,7 @@
}
final CssBoxDimensions getCheckBoxMargin() {
- TableThemeAdapter themeAdapter = ( TableThemeAdapter )getAdapter( IThemeAdapter.class );
+ TableThemeAdapter themeAdapter = ( TableThemeAdapter )getAdapter( ThemeAdapter.class );
CssBoxDimensions margin = themeAdapter.getCheckBoxMargin( this );
if( !margin.equals( CssBoxDimensions.ZERO ) ) {
return margin;
@@ -2644,7 +2644,7 @@
IControlAdapter controlAdapter = getAdapter( IControlAdapter.class );
Font result = controlAdapter.getUserFont();
if( result == null ) {
- TableThemeAdapter themeAdapter = ( TableThemeAdapter )getAdapter( IThemeAdapter.class );
+ TableThemeAdapter themeAdapter = ( TableThemeAdapter )getAdapter( ThemeAdapter.class );
result = themeAdapter.getHeaderFont( this );
}
return result;
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/TableColumn.java
index e6a157c..0c3175f 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/TableColumn.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/TableColumn.java
@@ -16,7 +16,7 @@
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.events.ControlListener;
@@ -532,7 +532,7 @@
if( parent.getSortColumn() == this && parent.getSortDirection() != SWT.NONE ) {
result += SORT_INDICATOR_WIDTH + SPACING;
}
- TableThemeAdapter adapter = ( TableThemeAdapter )parent.getAdapter( IThemeAdapter.class );
+ TableThemeAdapter adapter = ( TableThemeAdapter )parent.getAdapter( ThemeAdapter.class );
result += adapter.getHeaderPadding( parent ).getWidth();
// Mimic Windows behaviour that forces first item to resolve
if( parent.getItemCount() > 0 && parent.getCachedItems().length == 0 ) {
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Text.java
index 28f031b..dae9da4 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Text.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Text.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2013 Innoopract Informationssysteme GmbH.
+ * Copyright (c) 2002, 2015 Innoopract Informationssysteme GmbH.
* 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
@@ -12,7 +12,7 @@
package org.eclipse.swt.widgets;
import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.events.ModifyListener;
@@ -1142,6 +1142,6 @@
}
private TextThemeAdapter getThemeAdapter() {
- return ( TextThemeAdapter )getAdapter( IThemeAdapter.class );
+ return ( TextThemeAdapter )getAdapter( ThemeAdapter.class );
}
}
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ToolBar.java
index 5a29a9c..cb4e54b 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ToolBar.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ToolBar.java
@@ -12,7 +12,7 @@
package org.eclipse.swt.widgets;
import org.eclipse.rap.rwt.internal.theme.CssBoxDimensions;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.graphics.Font;
@@ -288,7 +288,7 @@
}
CssBoxDimensions getToolBarPadding() {
- ToolBarThemeAdapter themeAdapter = ( ToolBarThemeAdapter )getAdapter( IThemeAdapter.class );
+ ToolBarThemeAdapter themeAdapter = ( ToolBarThemeAdapter )getAdapter( ThemeAdapter.class );
return themeAdapter.getToolBarPadding( this );
}
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ToolItem.java
index 8d44b1f..937231b 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ToolItem.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ToolItem.java
@@ -17,7 +17,7 @@
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
import org.eclipse.rap.rwt.internal.theme.CssBoxDimensions;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.events.SelectionEvent;
@@ -640,7 +640,7 @@
}
private ToolBarThemeAdapter getToolBarThemeAdapter() {
- return ( ToolBarThemeAdapter )parent.getAdapter( IThemeAdapter.class );
+ return ( ToolBarThemeAdapter )parent.getAdapter( ThemeAdapter.class );
}
/**
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Tree.java
index 3fef978..90efade 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Tree.java
@@ -23,7 +23,7 @@
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
import org.eclipse.rap.rwt.internal.theme.CssBoxDimensions;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.rap.rwt.template.Template;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
@@ -2011,7 +2011,7 @@
}
private TreeThemeAdapter getThemeAdapter() {
- return ( TreeThemeAdapter )getAdapter( IThemeAdapter.class );
+ return ( TreeThemeAdapter )getAdapter( ThemeAdapter.class );
}
private Point getCheckImageOuterSize() {
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/TreeColumn.java
index 334d261..b1df5fc 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/TreeColumn.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/TreeColumn.java
@@ -16,7 +16,7 @@
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.events.ControlListener;
@@ -361,7 +361,7 @@
result += MARGIN_IMAGE;
}
}
- TreeThemeAdapter themeAdapter = ( TreeThemeAdapter )parent.getAdapter( IThemeAdapter.class );
+ TreeThemeAdapter themeAdapter = ( TreeThemeAdapter )parent.getAdapter( ThemeAdapter.class );
result += themeAdapter.getHeaderPadding( parent ).getWidth();
return result;
}
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Widget.java
index d882e8d..ce7c681 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Widget.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Widget.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2014 Innoopract Informationssysteme GmbH and others.
+ * Copyright (c) 2002, 2015 Innoopract Informationssysteme GmbH 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
@@ -22,7 +22,7 @@
import org.eclipse.rap.rwt.internal.lifecycle.PhaseId;
import org.eclipse.rap.rwt.internal.lifecycle.WidgetAdapter;
import org.eclipse.rap.rwt.internal.lifecycle.WidgetLifeCycleAdapter;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.rap.rwt.internal.theme.ThemeManager;
import org.eclipse.rap.rwt.scripting.ClientListener;
import org.eclipse.swt.SWT;
@@ -180,7 +180,7 @@
widgetAdapter = createWidgetAdapter( widgetAdapter.getParent() );
}
result = ( T )widgetAdapter;
- } else if( adapter == IThemeAdapter.class ) {
+ } else if( adapter == ThemeAdapter.class ) {
ApplicationContextImpl applicationContext = getApplicationContext();
ThemeManager themeManager = applicationContext.getThemeManager();
result = ( T )themeManager.getThemeAdapterManager().getThemeAdapter( this );
diff --git a/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/custom/clabelkit/CLabelLCA.java b/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/custom/clabelkit/CLabelLCA.java
index b54c39c..366a25b 100644
--- a/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/custom/clabelkit/CLabelLCA.java
+++ b/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/custom/clabelkit/CLabelLCA.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2014 Innoopract Informationssysteme GmbH and others.
+ * Copyright (c) 2002, 2015 Innoopract Informationssysteme GmbH 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
@@ -23,7 +23,7 @@
import java.io.IOException;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.rap.rwt.internal.util.MnemonicUtil;
import org.eclipse.rap.rwt.internal.lifecycle.AbstractWidgetLCA;
import org.eclipse.rap.rwt.internal.lifecycle.ControlLCAUtil;
@@ -149,7 +149,7 @@
}
private static CLabelThemeAdapter getThemeAdapter( CLabel clabel ) {
- return ( CLabelThemeAdapter )clabel.getAdapter( IThemeAdapter.class );
+ return ( CLabelThemeAdapter )clabel.getAdapter( ThemeAdapter.class );
}
}
diff --git a/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/controlkit/ControlThemeAdapterImpl.java b/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/controlkit/ControlThemeAdapterImpl.java
index 4228223..d76ec7f 100644
--- a/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/controlkit/ControlThemeAdapterImpl.java
+++ b/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/controlkit/ControlThemeAdapterImpl.java
@@ -11,7 +11,7 @@
******************************************************************************/
package org.eclipse.swt.internal.widgets.controlkit;
-import org.eclipse.rap.rwt.internal.theme.AbstractThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.rap.rwt.internal.theme.CssBoxDimensions;
import org.eclipse.rap.rwt.internal.theme.WidgetMatcher;
import org.eclipse.rap.rwt.theme.ControlThemeAdapter;
@@ -22,7 +22,7 @@
import org.eclipse.swt.widgets.Control;
-public class ControlThemeAdapterImpl extends AbstractThemeAdapter implements ControlThemeAdapter {
+public class ControlThemeAdapterImpl extends ThemeAdapter implements ControlThemeAdapter {
@Override
protected void configureMatcher( WidgetMatcher matcher ) {
diff --git a/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/scrollbarkit/ScrollBarThemeAdapter.java b/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/scrollbarkit/ScrollBarThemeAdapter.java
index e1abf88..e266b92 100644
--- a/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/scrollbarkit/ScrollBarThemeAdapter.java
+++ b/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/scrollbarkit/ScrollBarThemeAdapter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2012 EclipseSource and others.
+ * Copyright (c) 2011, 2015 EclipseSource 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,13 +10,13 @@
******************************************************************************/
package org.eclipse.swt.internal.widgets.scrollbarkit;
-import org.eclipse.rap.rwt.internal.theme.AbstractThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.rap.rwt.internal.theme.WidgetMatcher;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.ScrollBar;
-public class ScrollBarThemeAdapter extends AbstractThemeAdapter {
+public class ScrollBarThemeAdapter extends ThemeAdapter {
protected void configureMatcher( WidgetMatcher matcher ) {
matcher.addStyle( "HORIZONTAL", SWT.HORIZONTAL );
diff --git a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/lifecycle/ThemeAdapter_Test.java b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/lifecycle/ThemeAdapter_Test.java
index e12d6ed..873802c 100644
--- a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/lifecycle/ThemeAdapter_Test.java
+++ b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/lifecycle/ThemeAdapter_Test.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2014 EclipseSource and others.
+ * Copyright (c) 2009, 2015 EclipseSource and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.
* which accompanies this distribution, and is available at
@@ -13,7 +13,7 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.rap.rwt.testfixture.internal.Fixture;
import org.eclipse.swt.SWT;
import org.eclipse.swt.internal.widgets.controlkit.ControlThemeAdapterImpl;
@@ -43,7 +43,7 @@
public void testAdapterForShell() {
Display display = new Display();
Composite shell = new Shell( display, SWT.NONE );
- Object adapter = shell.getAdapter( IThemeAdapter.class );
+ Object adapter = shell.getAdapter( ThemeAdapter.class );
assertNotNull( adapter );
assertTrue( adapter instanceof ShellThemeAdapter );
}
@@ -53,7 +53,7 @@
Display display = new Display();
Composite shell = new Shell( display, SWT.NONE );
Composite composite = new Composite( shell, SWT.NONE );
- Object adapter = composite.getAdapter( IThemeAdapter.class );
+ Object adapter = composite.getAdapter( ThemeAdapter.class );
assertNotNull( adapter );
assertTrue( adapter instanceof ControlThemeAdapterImpl );
}
@@ -63,7 +63,7 @@
Display display = new Display();
Composite shell = new Shell( display, SWT.NONE );
CustomWidget customWidget = new CustomWidget( shell, SWT.NONE );
- Object adapter = customWidget.getAdapter( IThemeAdapter.class );
+ Object adapter = customWidget.getAdapter( ThemeAdapter.class );
assertNotNull( adapter );
assertTrue( adapter instanceof ControlThemeAdapterImpl );
}
diff --git a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/ControlThemeAdapter_Test.java b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/ControlThemeAdapter_Test.java
index cc99cb2..1f3f029 100644
--- a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/ControlThemeAdapter_Test.java
+++ b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/ControlThemeAdapter_Test.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2014 Innoopract Informationssysteme GmbH and others.
+ * Copyright (c) 2008, 2015 Innoopract Informationssysteme GmbH 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
@@ -97,7 +97,7 @@
}
private ControlThemeAdapter getControlThemeAdapter( Control control ) {
- return ( ControlThemeAdapterImpl )control.getAdapter( IThemeAdapter.class );
+ return ( ControlThemeAdapterImpl )control.getAdapter( ThemeAdapter.class );
}
}
diff --git a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/ShellThemeAdapter_Test.java b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/ShellThemeAdapter_Test.java
index f41e4b3..f4381f4 100644
--- a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/ShellThemeAdapter_Test.java
+++ b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/ShellThemeAdapter_Test.java
@@ -133,7 +133,7 @@
}
private static ShellThemeAdapter getShellThemeAdapter( Shell shell ) {
- return ( ShellThemeAdapter )shell.getAdapter( IThemeAdapter.class );
+ return ( ShellThemeAdapter )shell.getAdapter( ThemeAdapter.class );
}
}
diff --git a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/ThemeAdapterManager_Test.java b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/ThemeAdapterManager_Test.java
index b74e4a4..95a4e6f 100644
--- a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/ThemeAdapterManager_Test.java
+++ b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/ThemeAdapterManager_Test.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2014 EclipseSource and others.
+ * Copyright (c) 2011, 2015 EclipseSource 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
@@ -56,7 +56,7 @@
public void testGetThemeAdapterForWidgetWithThemeAdapter() {
ThemeAdapterManager themeAdapterManager = new ThemeAdapterManager();
- IThemeAdapter themeAdapter = themeAdapterManager.getThemeAdapter( shell );
+ ThemeAdapter themeAdapter = themeAdapterManager.getThemeAdapter( shell );
assertNotNull( themeAdapter );
}
@@ -64,8 +64,8 @@
public void testGetThemeAdapterReturnsSameAdapterForSameWidget() {
ThemeAdapterManager themeAdapterManager = new ThemeAdapterManager();
- IThemeAdapter themeAdapter1 = themeAdapterManager.getThemeAdapter( shell );
- IThemeAdapter themeAdapter2 = themeAdapterManager.getThemeAdapter( shell );
+ ThemeAdapter themeAdapter1 = themeAdapterManager.getThemeAdapter( shell );
+ ThemeAdapter themeAdapter2 = themeAdapterManager.getThemeAdapter( shell );
assertSame( themeAdapter1, themeAdapter2 );
}
diff --git a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/AbstractThemeAdapter_Test.java b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/ThemeAdapter_Test.java
similarity index 88%
rename from tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/AbstractThemeAdapter_Test.java
rename to tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/ThemeAdapter_Test.java
index 50b9abe..3366a7b 100644
--- a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/AbstractThemeAdapter_Test.java
+++ b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/ThemeAdapter_Test.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2014 Innoopract Informationssysteme GmbH and others.
+ * Copyright (c) 2008, 2015 Innoopract Informationssysteme GmbH 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
@@ -34,7 +34,7 @@
import org.junit.Test;
-public class AbstractThemeAdapter_Test {
+public class ThemeAdapter_Test {
private Shell shell;
@@ -55,19 +55,19 @@
@Test
public void testGetPrimaryElementForLabel() {
Label label = new Label( shell, SWT.NONE );
- assertEquals( "Label", AbstractThemeAdapter.getPrimaryElement( label ) );
+ assertEquals( "Label", ThemeAdapter.getPrimaryElement( label ) );
}
@Test
public void testGetPrimaryElementForButton() {
Button button = new Button( shell, SWT.BORDER );
- assertEquals( "Button", AbstractThemeAdapter.getPrimaryElement( button ) );
+ assertEquals( "Button", ThemeAdapter.getPrimaryElement( button ) );
}
@Test
public void testGetPrimaryElementForTree() {
Tree tree = new Tree( shell, SWT.BORDER );
- assertEquals( "Tree", AbstractThemeAdapter.getPrimaryElement( tree ) );
+ assertEquals( "Tree", ThemeAdapter.getPrimaryElement( tree ) );
}
@Test
@@ -75,7 +75,7 @@
Composite customComposite = new Composite( shell, SWT.BORDER ) {
// empty subclass
};
- assertEquals( "Composite", AbstractThemeAdapter.getPrimaryElement( customComposite ) );
+ assertEquals( "Composite", ThemeAdapter.getPrimaryElement( customComposite ) );
}
@Test
@@ -88,7 +88,7 @@
themeManager.initialize();
themeManager.registerTheme( theme );
themeManager.activate();
- AbstractThemeAdapter adapter = new AbstractThemeAdapter() {
+ ThemeAdapter adapter = new ThemeAdapter() {
@Override
protected void configureMatcher( WidgetMatcher matcher ) {
}
diff --git a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/ToolBarThemeAdapter_Test.java b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/ToolBarThemeAdapter_Test.java
index 866a7b3..d7bb123 100644
--- a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/ToolBarThemeAdapter_Test.java
+++ b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/theme/ToolBarThemeAdapter_Test.java
@@ -57,7 +57,7 @@
}
private static ToolBarThemeAdapter getThemeAdapter( ToolBar toolBar ) {
- return ( ToolBarThemeAdapter )toolBar.getAdapter( IThemeAdapter.class );
+ return ( ToolBarThemeAdapter )toolBar.getAdapter( ThemeAdapter.class );
}
}
diff --git a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/swt/custom/CLabel_Test.java b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/swt/custom/CLabel_Test.java
index c9b3ccb..e11a91b 100644
--- a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/swt/custom/CLabel_Test.java
+++ b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/swt/custom/CLabel_Test.java
@@ -22,7 +22,7 @@
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.internal.lifecycle.PhaseId;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.rap.rwt.testfixture.internal.Fixture;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
@@ -112,7 +112,7 @@
@Test
public void testSetMargins() {
- CLabelThemeAdapter themeAdapter = ( CLabelThemeAdapter )label.getAdapter( IThemeAdapter.class );
+ CLabelThemeAdapter themeAdapter = ( CLabelThemeAdapter )label.getAdapter( ThemeAdapter.class );
Rectangle padding = themeAdapter.getPadding( label );
assertEquals( padding.x, label.getLeftMargin() );
assertEquals( padding.y, label.getTopMargin() );
diff --git a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/swt/widgets/Control_Test.java b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/swt/widgets/Control_Test.java
index 4397990..9a9ab40 100644
--- a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/swt/widgets/Control_Test.java
+++ b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/swt/widgets/Control_Test.java
@@ -35,7 +35,7 @@
import org.eclipse.rap.rwt.internal.lifecycle.AbstractWidgetLCA;
import org.eclipse.rap.rwt.internal.lifecycle.PhaseId;
import org.eclipse.rap.rwt.internal.lifecycle.WidgetLifeCycleAdapter;
-import org.eclipse.rap.rwt.internal.theme.IThemeAdapter;
+import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.rap.rwt.internal.theme.ThemeTestUtil;
import org.eclipse.rap.rwt.testfixture.internal.Fixture;
import org.eclipse.rap.rwt.theme.ControlThemeAdapter;
@@ -97,7 +97,7 @@
public void testGetAdapterWithControlThemeAdapter() {
Control control = new Button( shell, SWT.NONE );
Object controlThemeAdapter = control.getAdapter( ControlThemeAdapter.class );
- Object themeAdapter = control.getAdapter( IThemeAdapter.class );
+ Object themeAdapter = control.getAdapter( ThemeAdapter.class );
assertNotNull( controlThemeAdapter );
assertSame( controlThemeAdapter, themeAdapter );
}
@@ -1237,7 +1237,7 @@
}
private static ControlThemeAdapter getThemeAdapter( Control control ) {
- return ( ControlThemeAdapter )control.getAdapter( IThemeAdapter.class );
+ return ( ControlThemeAdapter )control.getAdapter( ThemeAdapter.class );
}
@Test
