litesoft
Diff Revisions
947
vs
948
for /trunk/Java/GWT/Client/src/com/google/gwt/gen2/table/client/property/ColumnPropertyManager.java
|
@@ -15,16 +15,15 @@ |
15 |
15 |
|
*/ |
16 |
16 |
|
package com.google.gwt.gen2.table.client.property; |
17 |
17 |
|
|
18 |
|
- |
import java.util.*; |
19 |
|
- |
|
20 |
18 |
|
import com.google.gwt.gen2.table.client.property.ColumnProperty.*; |
21 |
19 |
|
|
|
20 |
+ |
import java.util.*; |
|
21 |
+ |
|
22 |
22 |
|
/** |
23 |
23 |
|
* Manager responsible for adding, retrieving, and removing |
24 |
24 |
|
* {@link ColumnProperty}. |
25 |
25 |
|
*/ |
26 |
|
- |
public class ColumnPropertyManager |
27 |
|
- |
{ |
|
26 |
+ |
public class ColumnPropertyManager { |
28 |
27 |
|
/** |
29 |
28 |
|
* A map of property types to their associated properties. |
30 |
29 |
|
*/ |
|
@@ -46,8 +45,7 @@ |
46 |
45 |
|
* |
47 |
46 |
|
* @return the property, or the default value if the property is not defined |
48 |
47 |
|
*/ |
49 |
|
- |
public <P extends ColumnProperty> P getColumnProperty( ColumnProperty.Type<P> type ) |
50 |
|
- |
{ |
|
48 |
+ |
public <P extends ColumnProperty> P getColumnProperty( ColumnProperty.Type<P> type ) { |
51 |
49 |
|
return getColumnProperty( type, true ); |
52 |
50 |
|
} |
53 |
51 |
|
|
|
@@ -62,11 +60,9 @@ |
62 |
60 |
|
* @return the property, or the default value if the property is not defined |
63 |
61 |
|
*/ |
64 |
62 |
|
@SuppressWarnings("unchecked") |
65 |
|
- |
public <P extends ColumnProperty> P getColumnProperty( ColumnProperty.Type<P> type, boolean useDefault ) |
66 |
|
- |
{ |
|
63 |
+ |
public <P extends ColumnProperty> P getColumnProperty( ColumnProperty.Type<P> type, boolean useDefault ) { |
67 |
64 |
|
Object property = properties.get( type ); |
68 |
|
- |
if ( property == null && useDefault ) |
69 |
|
- |
{ |
|
65 |
+ |
if ( property == null && useDefault ) { |
70 |
66 |
|
return type.getDefault(); |
71 |
67 |
|
} |
72 |
68 |
|
return (P) property; |
|
@@ -80,11 +76,9 @@ |
80 |
76 |
|
* @return the removed property, or null if one was never set |
81 |
77 |
|
*/ |
82 |
78 |
|
@SuppressWarnings("unchecked") |
83 |
|
- |
public <P extends ColumnProperty> P removeColumnProperty( ColumnProperty.Type<P> type ) |
84 |
|
- |
{ |
|
79 |
+ |
public <P extends ColumnProperty> P removeColumnProperty( ColumnProperty.Type<P> type ) { |
85 |
80 |
|
Object property = properties.remove( type ); |
86 |
|
- |
if ( property == null ) |
87 |
|
- |
{ |
|
81 |
+ |
if ( property == null ) { |
88 |
82 |
|
return null; |
89 |
83 |
|
} |
90 |
84 |
|
return (P) property; |
|
@@ -97,8 +91,7 @@ |
97 |
91 |
|
* @param type the {@link ColumnProperty} type |
98 |
92 |
|
* @param property the property to set |
99 |
93 |
|
*/ |
100 |
|
- |
public <P extends ColumnProperty> void setColumnProperty( ColumnProperty.Type<P> type, P property ) |
101 |
|
- |
{ |
|
94 |
+ |
public <P extends ColumnProperty> void setColumnProperty( ColumnProperty.Type<P> type, P property ) { |
102 |
95 |
|
assert type != null : "Cannot add a property with a null type"; |
103 |
96 |
|
assert property != null : "Cannot add a null property"; |
104 |
97 |
|
properties.put( type, property ); |