Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheetListener.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheetListener.java?rev=1913470&r1=1913469&r2=1913470&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheetListener.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheetListener.java Tue
Oct 31 19:15:47 2023
@@ -1,171 +1,171 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pivot.wtk;
-
-import org.apache.commons.vfs2.FileObject;
-import org.apache.commons.vfs2.FileSystemManager;
-import org.apache.pivot.collections.Sequence;
-import org.apache.pivot.util.Filter;
-import org.apache.pivot.util.ListenerList;
-
-/**
- * Commons VFS browser sheet listener interface.
- */
-public interface VFSBrowserSheetListener {
- /**
- * VFS Browser sheet listeners.
- */
- public static class Listeners extends ListenerList<VFSBrowserSheetListener>
- implements VFSBrowserSheetListener {
- @Override
- public void managerChanged(VFSBrowserSheet fileBrowserSheet,
- FileSystemManager previousManager) {
- forEach(listener -> listener.managerChanged(fileBrowserSheet,
previousManager));
- }
-
- @Override
- public void modeChanged(VFSBrowserSheet fileBrowserSheet,
VFSBrowserSheet.Mode previousMode) {
- forEach(listener -> listener.modeChanged(fileBrowserSheet,
previousMode));
- }
-
- @Override
- public void rootDirectoryChanged(VFSBrowserSheet fileBrowserSheet,
- FileObject previousRootDirectory) {
- forEach(listener ->
listener.rootDirectoryChanged(fileBrowserSheet, previousRootDirectory));
- }
-
- @Override
- public void homeDirectoryChanged(VFSBrowserSheet fileBrowserSheet,
- FileObject previousHomeDirectory) {
- forEach(listener ->
listener.homeDirectoryChanged(fileBrowserSheet, previousHomeDirectory));
- }
-
- @Override
- public void selectedFilesChanged(VFSBrowserSheet fileBrowserSheet,
- Sequence<FileObject> previousSelectedFiles) {
- forEach(listener ->
listener.selectedFilesChanged(fileBrowserSheet, previousSelectedFiles));
- }
-
- @Override
- public void disabledFileFilterChanged(VFSBrowserSheet fileBrowserSheet,
- Filter<FileObject> previousDisabledFileFilter) {
- forEach(listener ->
listener.disabledFileFilterChanged(fileBrowserSheet,
previousDisabledFileFilter));
- }
- }
-
- /**
- * Commons VFS browser sheet listener adapter.
- * @deprecated Since 2.1 and Java 8 the interface itself has default
implementations.
- */
- @Deprecated
- public static class Adapter implements VFSBrowserSheetListener {
- @Override
- public void managerChanged(VFSBrowserSheet fileBrowserSheet,
- FileSystemManager previousManager) {
- // empty block
- }
-
- @Override
- public void modeChanged(VFSBrowserSheet fileBrowserSheet,
VFSBrowserSheet.Mode previousMode) {
- // empty block
- }
-
- @Override
- public void rootDirectoryChanged(VFSBrowserSheet fileBrowserSheet,
- FileObject previousRootDirectory) {
- // empty block
- }
-
- @Override
- public void homeDirectoryChanged(VFSBrowserSheet fileBrowserSheet,
- FileObject previousHomeDirectory) {
- // empty block
- }
-
- @Override
- public void selectedFilesChanged(VFSBrowserSheet fileBrowserSheet,
- Sequence<FileObject> previousSelectedFiles) {
- // empty block
- }
-
- @Override
- public void disabledFileFilterChanged(VFSBrowserSheet fileBrowserSheet,
- Filter<FileObject> previousDisabledFileFilter) {
- // empty block
- }
- }
-
- /**
- * Called when a file browser's file system manager has changed (as when
- * browsing into a new virtual file system).
- *
- * @param fileBrowserSheet The source of this event.
- * @param previousManager The previous file manager that was set.
- */
- default void managerChanged(VFSBrowserSheet fileBrowserSheet,
FileSystemManager previousManager) {
- }
-
- /**
- * Called when a file browser sheet's mode has changed.
- *
- * @param fileBrowserSheet The source of this event.
- * @param previousMode The previous mode for this browser.
- */
- default void modeChanged(VFSBrowserSheet fileBrowserSheet,
VFSBrowserSheet.Mode previousMode) {
- }
-
- /**
- * Called when a file browser sheet's root directory has changed.
- *
- * @param fileBrowserSheet The browser sheet that has changed.
- * @param previousRootDirectory The previously set root directory for this
browser.
- */
- default void rootDirectoryChanged(VFSBrowserSheet fileBrowserSheet,
- FileObject previousRootDirectory) {
- }
-
- /**
- * Called when a file browser sheet's home directory has changed.
- * <p> Usually this would only be when you browse to another file system.
- *
- * @param fileBrowserSheet The browser sheet that has changed.
- * @param previousHomeDirectory The previously set home directory for this
browser.
- */
- default void homeDirectoryChanged(VFSBrowserSheet fileBrowserSheet,
- FileObject previousHomeDirectory) {
- }
-
- /**
- * Called when a file browser sheet's selection state has been reset.
- *
- * @param fileBrowserSheet The source of this event.
- * @param previousSelectedFiles The previous sequence of selected files.
- */
- default void selectedFilesChanged(VFSBrowserSheet fileBrowserSheet,
- Sequence<FileObject> previousSelectedFiles) {
- }
-
- /**
- * Called when a file browser sheet's disabled file filter has changed.
- *
- * @param fileBrowserSheet The source of this event.
- * @param previousDisabledFileFilter The previous filter for disabled
files.
- */
- default void disabledFileFilterChanged(VFSBrowserSheet fileBrowserSheet,
- Filter<FileObject> previousDisabledFileFilter) {
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pivot.wtk;
+
+import org.apache.commons.vfs2.FileObject;
+import org.apache.commons.vfs2.FileSystemManager;
+import org.apache.pivot.collections.Sequence;
+import org.apache.pivot.util.Filter;
+import org.apache.pivot.util.ListenerList;
+
+/**
+ * Commons VFS browser sheet listener interface.
+ */
+public interface VFSBrowserSheetListener {
+ /**
+ * VFS Browser sheet listeners.
+ */
+ public static class Listeners extends ListenerList<VFSBrowserSheetListener>
+ implements VFSBrowserSheetListener {
+ @Override
+ public void managerChanged(VFSBrowserSheet fileBrowserSheet,
+ FileSystemManager previousManager) {
+ forEach(listener -> listener.managerChanged(fileBrowserSheet,
previousManager));
+ }
+
+ @Override
+ public void modeChanged(VFSBrowserSheet fileBrowserSheet,
VFSBrowserSheet.Mode previousMode) {
+ forEach(listener -> listener.modeChanged(fileBrowserSheet,
previousMode));
+ }
+
+ @Override
+ public void rootDirectoryChanged(VFSBrowserSheet fileBrowserSheet,
+ FileObject previousRootDirectory) {
+ forEach(listener ->
listener.rootDirectoryChanged(fileBrowserSheet, previousRootDirectory));
+ }
+
+ @Override
+ public void homeDirectoryChanged(VFSBrowserSheet fileBrowserSheet,
+ FileObject previousHomeDirectory) {
+ forEach(listener ->
listener.homeDirectoryChanged(fileBrowserSheet, previousHomeDirectory));
+ }
+
+ @Override
+ public void selectedFilesChanged(VFSBrowserSheet fileBrowserSheet,
+ Sequence<FileObject> previousSelectedFiles) {
+ forEach(listener ->
listener.selectedFilesChanged(fileBrowserSheet, previousSelectedFiles));
+ }
+
+ @Override
+ public void disabledFileFilterChanged(VFSBrowserSheet fileBrowserSheet,
+ Filter<FileObject> previousDisabledFileFilter) {
+ forEach(listener ->
listener.disabledFileFilterChanged(fileBrowserSheet,
previousDisabledFileFilter));
+ }
+ }
+
+ /**
+ * Commons VFS browser sheet listener adapter.
+ * @deprecated Since 2.1 and Java 8 the interface itself has default
implementations.
+ */
+ @Deprecated
+ public static class Adapter implements VFSBrowserSheetListener {
+ @Override
+ public void managerChanged(VFSBrowserSheet fileBrowserSheet,
+ FileSystemManager previousManager) {
+ // empty block
+ }
+
+ @Override
+ public void modeChanged(VFSBrowserSheet fileBrowserSheet,
VFSBrowserSheet.Mode previousMode) {
+ // empty block
+ }
+
+ @Override
+ public void rootDirectoryChanged(VFSBrowserSheet fileBrowserSheet,
+ FileObject previousRootDirectory) {
+ // empty block
+ }
+
+ @Override
+ public void homeDirectoryChanged(VFSBrowserSheet fileBrowserSheet,
+ FileObject previousHomeDirectory) {
+ // empty block
+ }
+
+ @Override
+ public void selectedFilesChanged(VFSBrowserSheet fileBrowserSheet,
+ Sequence<FileObject> previousSelectedFiles) {
+ // empty block
+ }
+
+ @Override
+ public void disabledFileFilterChanged(VFSBrowserSheet fileBrowserSheet,
+ Filter<FileObject> previousDisabledFileFilter) {
+ // empty block
+ }
+ }
+
+ /**
+ * Called when a file browser's file system manager has changed (as when
+ * browsing into a new virtual file system).
+ *
+ * @param fileBrowserSheet The source of this event.
+ * @param previousManager The previous file manager that was set.
+ */
+ default void managerChanged(VFSBrowserSheet fileBrowserSheet,
FileSystemManager previousManager) {
+ }
+
+ /**
+ * Called when a file browser sheet's mode has changed.
+ *
+ * @param fileBrowserSheet The source of this event.
+ * @param previousMode The previous mode for this browser.
+ */
+ default void modeChanged(VFSBrowserSheet fileBrowserSheet,
VFSBrowserSheet.Mode previousMode) {
+ }
+
+ /**
+ * Called when a file browser sheet's root directory has changed.
+ *
+ * @param fileBrowserSheet The browser sheet that has changed.
+ * @param previousRootDirectory The previously set root directory for this
browser.
+ */
+ default void rootDirectoryChanged(VFSBrowserSheet fileBrowserSheet,
+ FileObject previousRootDirectory) {
+ }
+
+ /**
+ * Called when a file browser sheet's home directory has changed.
+ * <p> Usually this would only be when you browse to another file system.
+ *
+ * @param fileBrowserSheet The browser sheet that has changed.
+ * @param previousHomeDirectory The previously set home directory for this
browser.
+ */
+ default void homeDirectoryChanged(VFSBrowserSheet fileBrowserSheet,
+ FileObject previousHomeDirectory) {
+ }
+
+ /**
+ * Called when a file browser sheet's selection state has been reset.
+ *
+ * @param fileBrowserSheet The source of this event.
+ * @param previousSelectedFiles The previous sequence of selected files.
+ */
+ default void selectedFilesChanged(VFSBrowserSheet fileBrowserSheet,
+ Sequence<FileObject> previousSelectedFiles) {
+ }
+
+ /**
+ * Called when a file browser sheet's disabled file filter has changed.
+ *
+ * @param fileBrowserSheet The source of this event.
+ * @param previousDisabledFileFilter The previous filter for disabled
files.
+ */
+ default void disabledFileFilterChanged(VFSBrowserSheet fileBrowserSheet,
+ Filter<FileObject> previousDisabledFileFilter) {
+ }
+}
Propchange:
pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheetListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/WTKTaskListener.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/WTKTaskListener.java?rev=1913470&r1=1913469&r2=1913470&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/WTKTaskListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/WTKTaskListener.java Tue Oct 31
19:15:47 2023
@@ -1,43 +1,43 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pivot.wtk;
-
-import org.apache.pivot.util.concurrent.Task;
-import org.apache.pivot.util.concurrent.TaskListener;
-
-
-/**
- * Default implementation of the {@link TaskListener} interface
- * with default implementations of the methods.
- *
- * @param <V> Return value type for the task.
- */
-public class WTKTaskListener<V> implements TaskListener<V> {
- @Override
- public void taskExecuted(final Task<V> task) {
- // Empty block
- }
-
- /**
- * Calls the default {@link
ApplicationContext#handleUncaughtException(Thread,Throwable)}
- * with the {@link Task#getBackgroundThread} and {@link Task#getFault}.
- */
- @Override
- public void executeFailed(final Task<V> task) {
- ApplicationContext.handleUncaughtException(task.getBackgroundThread(),
task.getFault());
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pivot.wtk;
+
+import org.apache.pivot.util.concurrent.Task;
+import org.apache.pivot.util.concurrent.TaskListener;
+
+
+/**
+ * Default implementation of the {@link TaskListener} interface
+ * with default implementations of the methods.
+ *
+ * @param <V> Return value type for the task.
+ */
+public class WTKTaskListener<V> implements TaskListener<V> {
+ @Override
+ public void taskExecuted(final Task<V> task) {
+ // Empty block
+ }
+
+ /**
+ * Calls the default {@link
ApplicationContext#handleUncaughtException(Thread,Throwable)}
+ * with the {@link Task#getBackgroundThread} and {@link Task#getFault}.
+ */
+ @Override
+ public void executeFailed(final Task<V> task) {
+ ApplicationContext.handleUncaughtException(task.getBackgroundThread(),
task.getFault());
+ }
+}
Propchange: pivot/trunk/wtk/src/org/apache/pivot/wtk/WTKTaskListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/BaseContent.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/BaseContent.java?rev=1913470&r1=1913469&r2=1913470&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/BaseContent.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/BaseContent.java Tue Oct
31 19:15:47 2023
@@ -1,87 +1,87 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pivot.wtk.content;
-
-import java.net.URL;
-
-import org.apache.pivot.util.ImageUtils;
-import org.apache.pivot.wtk.media.Image;
-
-/**
- * The base content data for a number of different uses. Holds an icon
- * and/or some text.
- */
-public class BaseContent {
- protected Image icon = null;
- protected String text = null;
-
- public BaseContent() {
- this(null, null);
- }
-
- public BaseContent(Image icon) {
- this(icon, null);
- }
-
- public BaseContent(String text) {
- this(null, text);
- }
-
- public BaseContent(Image icon, String text) {
- this.icon = icon;
- this.text = text;
- }
-
- public Image getIcon() {
- return icon;
- }
-
- public void setIcon(Image icon) {
- this.icon = icon;
- }
-
- /**
- * Sets the content's icon by URL. <p> If the icon already exists in the
- * application context resource cache, the cached value will be used.
- * Otherwise, the icon will be loaded synchronously and added to the cache.
- *
- * @param iconURL The location of the icon to set.
- */
- public void setIcon(URL iconURL) {
- setIcon(Image.loadFromCache(iconURL));
- }
-
- /**
- * Sets the content's icon by
- * {@linkplain ClassLoader#getResource(String) resource name}.
- *
- * @param iconName The resource name of the icon to set.
- * @see #setIcon(URL)
- * @see ImageUtils#findByName(String,String)
- */
- public void setIcon(String iconName) {
- setIcon(ImageUtils.findByName(iconName, "icon"));
- }
-
- public String getText() {
- return text;
- }
-
- public void setText(String text) {
- this.text = text;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pivot.wtk.content;
+
+import java.net.URL;
+
+import org.apache.pivot.util.ImageUtils;
+import org.apache.pivot.wtk.media.Image;
+
+/**
+ * The base content data for a number of different uses. Holds an icon
+ * and/or some text.
+ */
+public class BaseContent {
+ protected Image icon = null;
+ protected String text = null;
+
+ public BaseContent() {
+ this(null, null);
+ }
+
+ public BaseContent(Image icon) {
+ this(icon, null);
+ }
+
+ public BaseContent(String text) {
+ this(null, text);
+ }
+
+ public BaseContent(Image icon, String text) {
+ this.icon = icon;
+ this.text = text;
+ }
+
+ public Image getIcon() {
+ return icon;
+ }
+
+ public void setIcon(Image icon) {
+ this.icon = icon;
+ }
+
+ /**
+ * Sets the content's icon by URL. <p> If the icon already exists in the
+ * application context resource cache, the cached value will be used.
+ * Otherwise, the icon will be loaded synchronously and added to the cache.
+ *
+ * @param iconURL The location of the icon to set.
+ */
+ public void setIcon(URL iconURL) {
+ setIcon(Image.loadFromCache(iconURL));
+ }
+
+ /**
+ * Sets the content's icon by
+ * {@linkplain ClassLoader#getResource(String) resource name}.
+ *
+ * @param iconName The resource name of the icon to set.
+ * @see #setIcon(URL)
+ * @see ImageUtils#findByName(String,String)
+ */
+ public void setIcon(String iconName) {
+ setIcon(ImageUtils.findByName(iconName, "icon"));
+ }
+
+ public String getText() {
+ return text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+}
Propchange: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/BaseContent.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewIndexBindMapping.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewIndexBindMapping.java?rev=1913470&r1=1913469&r2=1913470&view=diff
==============================================================================
---
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewIndexBindMapping.java
(original)
+++
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewIndexBindMapping.java
Tue Oct 31 19:15:47 2023
@@ -1,66 +1,66 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pivot.wtk.content;
-
-import org.apache.pivot.collections.List;
-import org.apache.pivot.wtk.ListView;
-
-
-/**
- * A {@link ListView.ItemBindMapping} that loads and stores just
- * the index itself instead of the selected item. This is a convenience
- * class for users where the data stored is just the index of the item.
- */
-public class ListViewIndexBindMapping implements ListView.ItemBindMapping {
-
- /**
- * Called during {@code load}, and {@code value} is what is
- * stored in our data object (which is the {@code Integer}
- * index value).
- *
- * @param listData The {@code ListView}'s data list.
- * @param value The object value to map to an index in this list
- * (which is an {@code Integer} value).
- * @return The value converted to an integer, or <code>-1</code>
- * if the value is out of range of the list size.
- */
- @Override
- public int indexOf(final List<?> listData, final Object value) {
- if (value instanceof Number) {
- int iValue = ((Number) value).intValue();
- if (iValue >= -1 && iValue < listData.getLength()) {
- return iValue;
- }
- }
- return -1;
- }
-
- /**
- * Called during {@code store}, and {@code index} is the
- * selected item index. We are going to just return an
- * {@code Integer} representing the index itself.
- *
- * @param listData The underlying data for the {@code ListView}.
- * @param index The index value to convert to a "storable" value.
- * @return The {@code Integer} value of the index.
- */
- @Override
- public Object get(final List<?> listData, final int index) {
- return Integer.valueOf(index);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pivot.wtk.content;
+
+import org.apache.pivot.collections.List;
+import org.apache.pivot.wtk.ListView;
+
+
+/**
+ * A {@link ListView.ItemBindMapping} that loads and stores just
+ * the index itself instead of the selected item. This is a convenience
+ * class for users where the data stored is just the index of the item.
+ */
+public class ListViewIndexBindMapping implements ListView.ItemBindMapping {
+
+ /**
+ * Called during {@code load}, and {@code value} is what is
+ * stored in our data object (which is the {@code Integer}
+ * index value).
+ *
+ * @param listData The {@code ListView}'s data list.
+ * @param value The object value to map to an index in this list
+ * (which is an {@code Integer} value).
+ * @return The value converted to an integer, or <code>-1</code>
+ * if the value is out of range of the list size.
+ */
+ @Override
+ public int indexOf(final List<?> listData, final Object value) {
+ if (value instanceof Number) {
+ int iValue = ((Number) value).intValue();
+ if (iValue >= -1 && iValue < listData.getLength()) {
+ return iValue;
+ }
+ }
+ return -1;
+ }
+
+ /**
+ * Called during {@code store}, and {@code index} is the
+ * selected item index. We are going to just return an
+ * {@code Integer} representing the index itself.
+ *
+ * @param listData The underlying data for the {@code ListView}.
+ * @param index The index value to convert to a "storable" value.
+ * @return The {@code Integer} value of the index.
+ */
+ @Override
+ public Object get(final List<?> listData, final int index) {
+ return Integer.valueOf(index);
+ }
+
+}
Propchange:
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewIndexBindMapping.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/SpinnerIndexBindMapping.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/SpinnerIndexBindMapping.java?rev=1913470&r1=1913469&r2=1913470&view=diff
==============================================================================
---
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/SpinnerIndexBindMapping.java
(original)
+++
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/SpinnerIndexBindMapping.java
Tue Oct 31 19:15:47 2023
@@ -1,66 +1,66 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pivot.wtk.content;
-
-import org.apache.pivot.collections.List;
-import org.apache.pivot.wtk.Spinner;
-
-
-/**
- * A {@link Spinner.ItemBindMapping} that loads and stores just
- * the index itself instead of the selected item. This is a convenience
- * class for users where the data stored is just the index of the item.
- */
-public class SpinnerIndexBindMapping implements Spinner.ItemBindMapping {
-
- /**
- * Called during {@code load}, and {@code value} is what is
- * stored in our data object (which is the {@code Integer}
- * index value).
- *
- * @param spinnerData The {@code Spinner}'s data list.
- * @param value The object value to map to an index in this list
- * (which is an {@code Integer} value).
- * @return The value converted to an integer, or <code>-1</code>
- * if the value is out of range of the data list size.
- */
- @Override
- public int indexOf(final List<?> spinnerData, final Object value) {
- if (value instanceof Integer) {
- int iValue = ((Integer) value).intValue();
- if (iValue >= -1 && iValue < spinnerData.getLength()) {
- return iValue;
- }
- }
- return -1;
- }
-
- /**
- * Called during {@code store}, and {@code index} is the
- * selected item index. We are going to just return an
- * {@code Integer} representing the index itself.
- *
- * @param spinnerData The underlying data for the {@code Spinner}.
- * @param index The index value to convert to a "storable" value.
- * @return The {@code Integer} value of the index.
- */
- @Override
- public Object get(final List<?> spinnerData, final int index) {
- return Integer.valueOf(index);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pivot.wtk.content;
+
+import org.apache.pivot.collections.List;
+import org.apache.pivot.wtk.Spinner;
+
+
+/**
+ * A {@link Spinner.ItemBindMapping} that loads and stores just
+ * the index itself instead of the selected item. This is a convenience
+ * class for users where the data stored is just the index of the item.
+ */
+public class SpinnerIndexBindMapping implements Spinner.ItemBindMapping {
+
+ /**
+ * Called during {@code load}, and {@code value} is what is
+ * stored in our data object (which is the {@code Integer}
+ * index value).
+ *
+ * @param spinnerData The {@code Spinner}'s data list.
+ * @param value The object value to map to an index in this list
+ * (which is an {@code Integer} value).
+ * @return The value converted to an integer, or <code>-1</code>
+ * if the value is out of range of the data list size.
+ */
+ @Override
+ public int indexOf(final List<?> spinnerData, final Object value) {
+ if (value instanceof Integer) {
+ int iValue = ((Integer) value).intValue();
+ if (iValue >= -1 && iValue < spinnerData.getLength()) {
+ return iValue;
+ }
+ }
+ return -1;
+ }
+
+ /**
+ * Called during {@code store}, and {@code index} is the
+ * selected item index. We are going to just return an
+ * {@code Integer} representing the index itself.
+ *
+ * @param spinnerData The underlying data for the {@code Spinner}.
+ * @param index The index value to convert to a "storable" value.
+ * @return The {@code Integer} value of the index.
+ */
+ @Override
+ public Object get(final List<?> spinnerData, final int index) {
+ return Integer.valueOf(index);
+ }
+
+}
Propchange:
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/SpinnerIndexBindMapping.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/UserContent.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/UserContent.java?rev=1913470&r1=1913469&r2=1913470&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/UserContent.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/UserContent.java Tue Oct
31 19:15:47 2023
@@ -1,50 +1,50 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pivot.wtk.content;
-
-import org.apache.pivot.wtk.media.Image;
-
-/**
- * Implementation of content data plus a user data object.
- */
-public class UserContent extends BaseContent {
- protected Object userData = null;
-
- public UserContent() {
- super(null, null);
- }
-
- public UserContent(Image icon) {
- super(icon, null);
- }
-
- public UserContent(String text) {
- super(null, text);
- }
-
- public UserContent(Image icon, String text) {
- super(icon, text);
- }
-
- public Object getUserData() {
- return userData;
- }
-
- public void setUserData(Object userData) {
- this.userData = userData;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pivot.wtk.content;
+
+import org.apache.pivot.wtk.media.Image;
+
+/**
+ * Implementation of content data plus a user data object.
+ */
+public class UserContent extends BaseContent {
+ protected Object userData = null;
+
+ public UserContent() {
+ super(null, null);
+ }
+
+ public UserContent(Image icon) {
+ super(icon, null);
+ }
+
+ public UserContent(String text) {
+ super(null, text);
+ }
+
+ public UserContent(Image icon, String text) {
+ super(icon, text);
+ }
+
+ public Object getUserData() {
+ return userData;
+ }
+
+ public void setUserData(Object userData) {
+ this.userData = userData;
+ }
+}
Propchange: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/UserContent.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/VerticalButtonDataRenderer.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/VerticalButtonDataRenderer.java?rev=1913470&r1=1913469&r2=1913470&view=diff
==============================================================================
---
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/VerticalButtonDataRenderer.java
(original)
+++
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/VerticalButtonDataRenderer.java
Tue Oct 31 19:15:47 2023
@@ -1,31 +1,31 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pivot.wtk.content;
-
-import org.apache.pivot.wtk.Orientation;
-
-/**
- * A button data renderer that just positions the image and label vertically
- * on top of each other.
- */
-public class VerticalButtonDataRenderer extends ButtonDataRenderer {
- /** Construct using our parent class' settings, but setting {@link
Orientation#VERTICAL}. */
- public VerticalButtonDataRenderer() {
- super();
- setOrientation(Orientation.VERTICAL);
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pivot.wtk.content;
+
+import org.apache.pivot.wtk.Orientation;
+
+/**
+ * A button data renderer that just positions the image and label vertically
+ * on top of each other.
+ */
+public class VerticalButtonDataRenderer extends ButtonDataRenderer {
+ /** Construct using our parent class' settings, but setting {@link
Orientation#VERTICAL}. */
+ public VerticalButtonDataRenderer() {
+ super();
+ setOrientation(Orientation.VERTICAL);
+ }
+}
Propchange:
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/VerticalButtonDataRenderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/NumberRulerSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/NumberRulerSkin.java?rev=1913470&r1=1913469&r2=1913470&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/NumberRulerSkin.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/NumberRulerSkin.java Tue Oct
31 19:15:47 2023
@@ -1,476 +1,476 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pivot.wtk.skin;
-
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.font.LineMetrics;
-import java.awt.geom.Rectangle2D;
-import java.text.StringCharacterIterator;
-import java.util.Arrays;
-
-import org.apache.pivot.util.Utils;
-import org.apache.pivot.wtk.Component;
-import org.apache.pivot.wtk.Insets;
-import org.apache.pivot.wtk.NumberRuler;
-import org.apache.pivot.wtk.NumberRulerListener;
-import org.apache.pivot.wtk.Orientation;
-import org.apache.pivot.wtk.Platform;
-
-/**
- * Skin for the {@link NumberRuler} component, which can be used as a
horizontal or
- * vertical header for viewports.
- */
-public class NumberRulerSkin extends ComponentSkin implements
NumberRulerListener {
- /** Number of pixels to use for major division tic marks. */
- private static final int MAJOR_SIZE = 10;
- /** Number of pixels to use for minor division tic marks. */
- private static final int MINOR_SIZE = 8;
- /** Number of pixels to use for regular tic marks. */
- private static final int REGULAR_SIZE = 5;
-
- /** Font used to draw the numbers. */
- private Font font;
- /** Foreground color for the tic marks and the numbers. */
- private Color color;
- /** Background color for the ruler. */
- private Color backgroundColor;
- /** Fixed amount of padding. */
- private int padding = 2;
- /** Number of pixels between markers in horizontal orientation. */
- private int markerSpacing;
- /** Insets for the markers inside the component area. */
- private Insets markerInsets;
- /** Amount of padding between rows in vertical mode. */
- private Insets rowPadding;
- /** Major divisions at (fixed) 10 character positions. */
- private int majorDivision;
- /** Minor divisions at (fixed) 5 character positions. */
- private int minorDivision;
- /** Whether to show the zero number in horizontal mode. */
- private boolean showZeroNumber;
- /** Whether to show major numbers on a horizontal ruler. */
- private boolean showMajorNumbers;
- /** Whether to show minor numbers on a horizontal ruler. */
- private boolean showMinorNumbers;
- /** Calculated measurements for the font. */
- private float charHeight, descent;
- /** Pre-calculated line height for drawing. */
- private int lineHeight;
-
-
- @Override
- public void install(final Component component) {
- super.install(component);
-
- setFont(getThemeFont());
-
- setDefaultStyles();
-
- // Note: these aren't settable
- majorDivision = 10;
- minorDivision = 5;
-
- NumberRuler ruler = (NumberRuler) component;
- ruler.getRulerListeners().add(this);
- }
-
- /**
- * @return The component.
- */
- private NumberRuler getNumberRuler() {
- return (NumberRuler) getComponent();
- }
-
- @Override
- public void layout() {
- // No-op
- }
-
- @Override
- public int getPreferredHeight(final int width) {
- NumberRuler ruler = getNumberRuler();
- Orientation orientation = ruler.getOrientation();
-
- // Give a little extra height if showing numbers
- return (orientation == Orientation.HORIZONTAL)
- ? ((showZeroNumber || showMajorNumbers || showMinorNumbers)
- ? ((int) Math.ceil(charHeight) + MAJOR_SIZE + 5) : MAJOR_SIZE
* 2) : 0;
- }
-
- @Override
- public int getPreferredWidth(final int height) {
- NumberRuler ruler = getNumberRuler();
- Orientation orientation = ruler.getOrientation();
-
- if (orientation == Orientation.VERTICAL) {
- int textSize = ruler.getTextSize();
-
- FontRenderContext fontRenderContext =
Platform.getFontRenderContext();
- char[] digits = new char[textSize];
- Arrays.fill(digits, '0');
- String text = new String(digits);
-
- Rectangle2D stringBounds = font.getStringBounds(text,
fontRenderContext);
- return (int) Math.ceil(stringBounds.getWidth()) + padding;
- }
-
- return 0;
- }
-
- /**
- * Draw the number at the tip of the marker.
- *
- * @param graphics The graphics context to draw in.
- * @param fontRenderContext Context used to render the font.
- * @param number The actual number value to draw.
- * @param x The X-position of the tip of the marker.
- * @param y The Y-position of the tip of the marker.
- */
- private void drawNumber(final Graphics2D graphics, final FontRenderContext
fontRenderContext,
- final int number, final int x, final int y) {
- String num = Integer.toString(number);
-
- StringCharacterIterator line;
- GlyphVector glyphVector;
- Rectangle2D textBounds;
- float width, height;
- float fx, fy;
-
- // Draw the whole number just off the tip of the line given by (x,y)
- line = new StringCharacterIterator(num);
- glyphVector = font.createGlyphVector(fontRenderContext, line);
- textBounds = glyphVector.getLogicalBounds();
- width = (float) textBounds.getWidth();
- height = (float) textBounds.getHeight();
- fx = (float) x - (width / 2.0f);
- fy = (float) (y - 2);
- graphics.drawGlyphVector(glyphVector, fx, fy);
- }
-
- @Override
- public void paint(final Graphics2D graphics) {
- int width = getWidth();
- int height = getHeight();
- int bottom = height - markerInsets.bottom;
-
- Rectangle clipRect = graphics.getClipBounds();
-
- NumberRuler ruler = getNumberRuler();
- int textSize = ruler.getTextSize();
-
- graphics.setColor(backgroundColor);
- graphics.fillRect(0, 0, width, height);
-
- graphics.setColor(color);
-
- FontRenderContext fontRenderContext = Platform.getFontRenderContext();
- graphics.setFont(font);
-
- Orientation orientation = ruler.getOrientation();
- Rectangle fullRect = new Rectangle(width, height);
- Rectangle clippedRect = fullRect.intersection(clipRect);
-
- Rectangle lineRect, clippedLineRect;
-
- switch (orientation) {
- case HORIZONTAL:
- int start = bottom - 1;
- int end2 = start - (MAJOR_SIZE - 1);
- int end3 = start - (MINOR_SIZE - 1);
- int end4 = start - (REGULAR_SIZE - 1);
-
- lineRect = new Rectangle(0, height - 1, width - 1, 0);
- clippedLineRect = lineRect.intersection(clipRect);
- graphics.drawLine(clippedLineRect.x, clippedLineRect.y,
- clippedLineRect.x + clippedLineRect.width,
clippedLineRect.y);
-
- for (int i = 0, n = width / markerSpacing + 1; i < n; i++) {
- int x = i * markerSpacing + markerInsets.left;
-
- if (majorDivision != 0 && i % majorDivision == 0) {
- graphics.drawLine(x, start, x, end2);
- if ((showZeroNumber && i == 0) || (showMajorNumbers &&
i > 0)) {
- drawNumber(graphics, fontRenderContext, i, x,
end2);
- }
- } else if (minorDivision != 0 && i % minorDivision == 0) {
- graphics.drawLine(x, start, x, end3);
- if ((showZeroNumber && i == 0) || (showMinorNumbers &&
i > 0)) {
- // Show the minor numbers at the same y point as
the major
- drawNumber(graphics, fontRenderContext, i, x,
end2);
- }
- } else {
- graphics.drawLine(x, start, x, end4);
- }
- }
- break;
-
- case VERTICAL:
- lineRect = new Rectangle(width - 1, 0, 0, height - 1);
- clippedLineRect = lineRect.intersection(clipRect);
- graphics.drawLine(clippedLineRect.x, clippedLineRect.y,
- clippedLineRect.x, clippedLineRect.y +
clippedLineRect.height);
-
- // Optimize drawing by only starting just above the current
clip bounds
- // down to the bottom (plus one) of the end of the clip bounds.
- // This is a 100x speed improvement for 500,000 lines.
- int linesAbove = clipRect.y / lineHeight;
- int linesBelow = (height - (clipRect.y + clipRect.height)) /
lineHeight;
- int totalLines = height / lineHeight + 1;
-
- for (int num = 1 + linesAbove, n = totalLines - (linesBelow -
1); num < n; num++) {
- String numberString = Integer.toString(num);
- StringCharacterIterator line = new
StringCharacterIterator(numberString);
-
- int lineY = (num - 1) * lineHeight + markerInsets.top;
- Graphics2D lineGraphics = (Graphics2D) graphics.create(0,
lineY, width, lineHeight);
-
- float y = (float) (lineHeight - rowPadding.bottom) -
descent;
- GlyphVector glyphVector =
font.createGlyphVector(fontRenderContext, line);
- Rectangle2D textBounds = glyphVector.getLogicalBounds();
- float lineWidth = (float) textBounds.getWidth();
- float x = (float) width - (lineWidth + (float) padding);
- lineGraphics.drawGlyphVector(glyphVector, x, y);
- }
- break;
-
- default:
- break;
- }
- }
-
- @Override
- public void orientationChanged(final NumberRuler ruler) {
- invalidateComponent();
- }
-
- @Override
- public void textSizeChanged(final NumberRuler ruler, final int
previousSize) {
- invalidateComponent();
- }
-
- /**
- * @return The insets for the markers (only applicable for horizontal
orientation).
- */
- public Insets getMarkerInsets() {
- return markerInsets;
- }
-
- /**
- * Set the marker insets (for horizontal rulers).
- *
- * @param insets The inset values.
- */
- public final void setMarkerInsets(final Object insets) {
- markerInsets = Insets.fromObject(insets, "markerInsets");
- repaintComponent();
- }
-
- /**
- * @return The row padding for vertical rulers.
- */
- public final Insets getRowPadding() {
- return rowPadding;
- }
-
- /**
- * Set the row padding for vertical rulers.
- *
- * @param paddingValue The row padding value.
- */
- public final void setRowPadding(final Object paddingValue) {
- rowPadding = Insets.fromObject(paddingValue, "rowPadding");
-
- // Do the line height calculations again with this new padding
- if (font != null) {
- setFont(font);
- } else {
- lineHeight = rowPadding.getHeight();
- invalidateComponent();
- }
- }
-
- /**
- * @return The number of pixels interval at which to draw markers.
- */
- public int getMarkerSpacing() {
- return markerSpacing;
- }
-
- /**
- * Set the number of pixels interval at which to draw the markers
- * (for horizontal orientation only).
- *
- * @param spacing The number of pixels between markers (must be {@code >=
1}).
- */
- public final void setMarkerSpacing(final int spacing) {
- Utils.checkPositive(spacing, "markerSpacing");
-
- markerSpacing = spacing;
- invalidateComponent();
- }
-
- /**
- * Set the number of pixels interval at which to draw the markers
- * (for horizontal orientation only).
- *
- * @param spacing The integer number of pixels between markers (must be
{@code >= 1}).
- */
- public final void setMarkerSpacing(final Number spacing) {
- Utils.checkNull(spacing, "markerSpacing");
-
- setMarkerSpacing(spacing.intValue());
- }
-
- /**
- * @return Whether to display a number at the zero point
- * (only applicable for horizontal orientation).
- */
- public boolean getShowZeroNumber() {
- return showZeroNumber;
- }
-
- /**
- * Sets the flag to say whether to show a number at the zero point
- * (only for horizontal orientation).
- *
- * @param showZero Whether a number should be shown for the zero point.
- */
- public final void setShowZeroNumber(final boolean showZero) {
- showZeroNumber = showZero;
-
- NumberRuler ruler = getNumberRuler();
- if (ruler.getOrientation() == Orientation.HORIZONTAL) {
- invalidateComponent();
- }
- }
-
- /**
- * @return Whether to display numbers at each major division
- * (only applicable for horizontal orientation).
- */
- public boolean getShowMajorNumbers() {
- return showMajorNumbers;
- }
-
- /**
- * Sets the flag to say whether to show numbers at each major division
- * (only for horizontal orientation).
- *
- * @param showNumbers Whether numbers should be shown for major divisions.
- */
- public final void setShowMajorNumbers(final boolean showNumbers) {
- showMajorNumbers = showNumbers;
-
- NumberRuler ruler = getNumberRuler();
- if (ruler.getOrientation() == Orientation.HORIZONTAL) {
- invalidateComponent();
- }
- }
-
- /**
- * @return Whether to display numbers at each minor division
- * (only for horizontal orientation).
- */
- public boolean getShowMinorNumbers() {
- return showMinorNumbers;
- }
-
- /**
- * Sets the flag to say whether to show numbers at each minor division
- * (for horizontal orientation only).
- *
- * @param showNumbers Whether numbers should be shown for minor divisions.
- */
- public final void setShowMinorNumbers(final boolean showNumbers) {
- showMinorNumbers = showNumbers;
-
- NumberRuler ruler = getNumberRuler();
- if (ruler.getOrientation() == Orientation.HORIZONTAL) {
- invalidateComponent();
- }
- }
-
- /**
- * @return The font used to render the Ruler's text.
- */
- public Font getFont() {
- return font;
- }
-
- /**
- * Sets the font used in rendering the Ruler's text.
- *
- * @param fontValue The new font to use.
- */
- public void setFont(final Object fontValue) {
- font = fontFromObject(fontValue);
-
- // Make some size calculations for the drawing code
- FontRenderContext fontRenderContext = Platform.getFontRenderContext();
- LineMetrics lm = font.getLineMetrics("0", fontRenderContext);
- charHeight = lm.getAscent();
- descent = lm.getDescent();
- lineHeight = (int) Math.ceil(lm.getHeight())
- + (rowPadding != null ? rowPadding.getHeight() : 0);
-
- invalidateComponent();
- }
-
- /**
- * Returns the foreground color of the text and markers of the ruler.
- *
- * @return The foreground (text and marker) color.
- */
- public Color getColor() {
- return color;
- }
-
- /**
- * Sets the foreground color of the text and markers of the ruler.
- *
- * @param colorValue The foreground (that is, the text and marker) color.
- */
- public void setColor(final Object colorValue) {
- color = colorFromObject(colorValue, "color");
- repaintComponent();
- }
-
- /**
- * Returns the background color of the ruler.
- *
- * @return The current background color.
- */
- public Color getBackgroundColor() {
- return backgroundColor;
- }
-
- /**
- * Sets the background color of the ruler.
- *
- * @param colorValue New background color value.
- */
- public void setBackgroundColor(final Object colorValue) {
- backgroundColor = colorFromObject(colorValue, "backgroundColor");
- repaintComponent();
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pivot.wtk.skin;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.font.FontRenderContext;
+import java.awt.font.GlyphVector;
+import java.awt.font.LineMetrics;
+import java.awt.geom.Rectangle2D;
+import java.text.StringCharacterIterator;
+import java.util.Arrays;
+
+import org.apache.pivot.util.Utils;
+import org.apache.pivot.wtk.Component;
+import org.apache.pivot.wtk.Insets;
+import org.apache.pivot.wtk.NumberRuler;
+import org.apache.pivot.wtk.NumberRulerListener;
+import org.apache.pivot.wtk.Orientation;
+import org.apache.pivot.wtk.Platform;
+
+/**
+ * Skin for the {@link NumberRuler} component, which can be used as a
horizontal or
+ * vertical header for viewports.
+ */
+public class NumberRulerSkin extends ComponentSkin implements
NumberRulerListener {
+ /** Number of pixels to use for major division tic marks. */
+ private static final int MAJOR_SIZE = 10;
+ /** Number of pixels to use for minor division tic marks. */
+ private static final int MINOR_SIZE = 8;
+ /** Number of pixels to use for regular tic marks. */
+ private static final int REGULAR_SIZE = 5;
+
+ /** Font used to draw the numbers. */
+ private Font font;
+ /** Foreground color for the tic marks and the numbers. */
+ private Color color;
+ /** Background color for the ruler. */
+ private Color backgroundColor;
+ /** Fixed amount of padding. */
+ private int padding = 2;
+ /** Number of pixels between markers in horizontal orientation. */
+ private int markerSpacing;
+ /** Insets for the markers inside the component area. */
+ private Insets markerInsets;
+ /** Amount of padding between rows in vertical mode. */
+ private Insets rowPadding;
+ /** Major divisions at (fixed) 10 character positions. */
+ private int majorDivision;
+ /** Minor divisions at (fixed) 5 character positions. */
+ private int minorDivision;
+ /** Whether to show the zero number in horizontal mode. */
+ private boolean showZeroNumber;
+ /** Whether to show major numbers on a horizontal ruler. */
+ private boolean showMajorNumbers;
+ /** Whether to show minor numbers on a horizontal ruler. */
+ private boolean showMinorNumbers;
+ /** Calculated measurements for the font. */
+ private float charHeight, descent;
+ /** Pre-calculated line height for drawing. */
+ private int lineHeight;
+
+
+ @Override
+ public void install(final Component component) {
+ super.install(component);
+
+ setFont(getThemeFont());
+
+ setDefaultStyles();
+
+ // Note: these aren't settable
+ majorDivision = 10;
+ minorDivision = 5;
+
+ NumberRuler ruler = (NumberRuler) component;
+ ruler.getRulerListeners().add(this);
+ }
+
+ /**
+ * @return The component.
+ */
+ private NumberRuler getNumberRuler() {
+ return (NumberRuler) getComponent();
+ }
+
+ @Override
+ public void layout() {
+ // No-op
+ }
+
+ @Override
+ public int getPreferredHeight(final int width) {
+ NumberRuler ruler = getNumberRuler();
+ Orientation orientation = ruler.getOrientation();
+
+ // Give a little extra height if showing numbers
+ return (orientation == Orientation.HORIZONTAL)
+ ? ((showZeroNumber || showMajorNumbers || showMinorNumbers)
+ ? ((int) Math.ceil(charHeight) + MAJOR_SIZE + 5) : MAJOR_SIZE
* 2) : 0;
+ }
+
+ @Override
+ public int getPreferredWidth(final int height) {
+ NumberRuler ruler = getNumberRuler();
+ Orientation orientation = ruler.getOrientation();
+
+ if (orientation == Orientation.VERTICAL) {
+ int textSize = ruler.getTextSize();
+
+ FontRenderContext fontRenderContext =
Platform.getFontRenderContext();
+ char[] digits = new char[textSize];
+ Arrays.fill(digits, '0');
+ String text = new String(digits);
+
+ Rectangle2D stringBounds = font.getStringBounds(text,
fontRenderContext);
+ return (int) Math.ceil(stringBounds.getWidth()) + padding;
+ }
+
+ return 0;
+ }
+
+ /**
+ * Draw the number at the tip of the marker.
+ *
+ * @param graphics The graphics context to draw in.
+ * @param fontRenderContext Context used to render the font.
+ * @param number The actual number value to draw.
+ * @param x The X-position of the tip of the marker.
+ * @param y The Y-position of the tip of the marker.
+ */
+ private void drawNumber(final Graphics2D graphics, final FontRenderContext
fontRenderContext,
+ final int number, final int x, final int y) {
+ String num = Integer.toString(number);
+
+ StringCharacterIterator line;
+ GlyphVector glyphVector;
+ Rectangle2D textBounds;
+ float width, height;
+ float fx, fy;
+
+ // Draw the whole number just off the tip of the line given by (x,y)
+ line = new StringCharacterIterator(num);
+ glyphVector = font.createGlyphVector(fontRenderContext, line);
+ textBounds = glyphVector.getLogicalBounds();
+ width = (float) textBounds.getWidth();
+ height = (float) textBounds.getHeight();
+ fx = (float) x - (width / 2.0f);
+ fy = (float) (y - 2);
+ graphics.drawGlyphVector(glyphVector, fx, fy);
+ }
+
+ @Override
+ public void paint(final Graphics2D graphics) {
+ int width = getWidth();
+ int height = getHeight();
+ int bottom = height - markerInsets.bottom;
+
+ Rectangle clipRect = graphics.getClipBounds();
+
+ NumberRuler ruler = getNumberRuler();
+ int textSize = ruler.getTextSize();
+
+ graphics.setColor(backgroundColor);
+ graphics.fillRect(0, 0, width, height);
+
+ graphics.setColor(color);
+
+ FontRenderContext fontRenderContext = Platform.getFontRenderContext();
+ graphics.setFont(font);
+
+ Orientation orientation = ruler.getOrientation();
+ Rectangle fullRect = new Rectangle(width, height);
+ Rectangle clippedRect = fullRect.intersection(clipRect);
+
+ Rectangle lineRect, clippedLineRect;
+
+ switch (orientation) {
+ case HORIZONTAL:
+ int start = bottom - 1;
+ int end2 = start - (MAJOR_SIZE - 1);
+ int end3 = start - (MINOR_SIZE - 1);
+ int end4 = start - (REGULAR_SIZE - 1);
+
+ lineRect = new Rectangle(0, height - 1, width - 1, 0);
+ clippedLineRect = lineRect.intersection(clipRect);
+ graphics.drawLine(clippedLineRect.x, clippedLineRect.y,
+ clippedLineRect.x + clippedLineRect.width,
clippedLineRect.y);
+
+ for (int i = 0, n = width / markerSpacing + 1; i < n; i++) {
+ int x = i * markerSpacing + markerInsets.left;
+
+ if (majorDivision != 0 && i % majorDivision == 0) {
+ graphics.drawLine(x, start, x, end2);
+ if ((showZeroNumber && i == 0) || (showMajorNumbers &&
i > 0)) {
+ drawNumber(graphics, fontRenderContext, i, x,
end2);
+ }
+ } else if (minorDivision != 0 && i % minorDivision == 0) {
+ graphics.drawLine(x, start, x, end3);
+ if ((showZeroNumber && i == 0) || (showMinorNumbers &&
i > 0)) {
+ // Show the minor numbers at the same y point as
the major
+ drawNumber(graphics, fontRenderContext, i, x,
end2);
+ }
+ } else {
+ graphics.drawLine(x, start, x, end4);
+ }
+ }
+ break;
+
+ case VERTICAL:
+ lineRect = new Rectangle(width - 1, 0, 0, height - 1);
+ clippedLineRect = lineRect.intersection(clipRect);
+ graphics.drawLine(clippedLineRect.x, clippedLineRect.y,
+ clippedLineRect.x, clippedLineRect.y +
clippedLineRect.height);
+
+ // Optimize drawing by only starting just above the current
clip bounds
+ // down to the bottom (plus one) of the end of the clip bounds.
+ // This is a 100x speed improvement for 500,000 lines.
+ int linesAbove = clipRect.y / lineHeight;
+ int linesBelow = (height - (clipRect.y + clipRect.height)) /
lineHeight;
+ int totalLines = height / lineHeight + 1;
+
+ for (int num = 1 + linesAbove, n = totalLines - (linesBelow -
1); num < n; num++) {
+ String numberString = Integer.toString(num);
+ StringCharacterIterator line = new
StringCharacterIterator(numberString);
+
+ int lineY = (num - 1) * lineHeight + markerInsets.top;
+ Graphics2D lineGraphics = (Graphics2D) graphics.create(0,
lineY, width, lineHeight);
+
+ float y = (float) (lineHeight - rowPadding.bottom) -
descent;
+ GlyphVector glyphVector =
font.createGlyphVector(fontRenderContext, line);
+ Rectangle2D textBounds = glyphVector.getLogicalBounds();
+ float lineWidth = (float) textBounds.getWidth();
+ float x = (float) width - (lineWidth + (float) padding);
+ lineGraphics.drawGlyphVector(glyphVector, x, y);
+ }
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ @Override
+ public void orientationChanged(final NumberRuler ruler) {
+ invalidateComponent();
+ }
+
+ @Override
+ public void textSizeChanged(final NumberRuler ruler, final int
previousSize) {
+ invalidateComponent();
+ }
+
+ /**
+ * @return The insets for the markers (only applicable for horizontal
orientation).
+ */
+ public Insets getMarkerInsets() {
+ return markerInsets;
+ }
+
+ /**
+ * Set the marker insets (for horizontal rulers).
+ *
+ * @param insets The inset values.
+ */
+ public final void setMarkerInsets(final Object insets) {
+ markerInsets = Insets.fromObject(insets, "markerInsets");
+ repaintComponent();
+ }
+
+ /**
+ * @return The row padding for vertical rulers.
+ */
+ public final Insets getRowPadding() {
+ return rowPadding;
+ }
+
+ /**
+ * Set the row padding for vertical rulers.
+ *
+ * @param paddingValue The row padding value.
+ */
+ public final void setRowPadding(final Object paddingValue) {
+ rowPadding = Insets.fromObject(paddingValue, "rowPadding");
+
+ // Do the line height calculations again with this new padding
+ if (font != null) {
+ setFont(font);
+ } else {
+ lineHeight = rowPadding.getHeight();
+ invalidateComponent();
+ }
+ }
+
+ /**
+ * @return The number of pixels interval at which to draw markers.
+ */
+ public int getMarkerSpacing() {
+ return markerSpacing;
+ }
+
+ /**
+ * Set the number of pixels interval at which to draw the markers
+ * (for horizontal orientation only).
+ *
+ * @param spacing The number of pixels between markers (must be {@code >=
1}).
+ */
+ public final void setMarkerSpacing(final int spacing) {
+ Utils.checkPositive(spacing, "markerSpacing");
+
+ markerSpacing = spacing;
+ invalidateComponent();
+ }
+
+ /**
+ * Set the number of pixels interval at which to draw the markers
+ * (for horizontal orientation only).
+ *
+ * @param spacing The integer number of pixels between markers (must be
{@code >= 1}).
+ */
+ public final void setMarkerSpacing(final Number spacing) {
+ Utils.checkNull(spacing, "markerSpacing");
+
+ setMarkerSpacing(spacing.intValue());
+ }
+
+ /**
+ * @return Whether to display a number at the zero point
+ * (only applicable for horizontal orientation).
+ */
+ public boolean getShowZeroNumber() {
+ return showZeroNumber;
+ }
+
+ /**
+ * Sets the flag to say whether to show a number at the zero point
+ * (only for horizontal orientation).
+ *
+ * @param showZero Whether a number should be shown for the zero point.
+ */
+ public final void setShowZeroNumber(final boolean showZero) {
+ showZeroNumber = showZero;
+
+ NumberRuler ruler = getNumberRuler();
+ if (ruler.getOrientation() == Orientation.HORIZONTAL) {
+ invalidateComponent();
+ }
+ }
+
+ /**
+ * @return Whether to display numbers at each major division
+ * (only applicable for horizontal orientation).
+ */
+ public boolean getShowMajorNumbers() {
+ return showMajorNumbers;
+ }
+
+ /**
+ * Sets the flag to say whether to show numbers at each major division
+ * (only for horizontal orientation).
+ *
+ * @param showNumbers Whether numbers should be shown for major divisions.
+ */
+ public final void setShowMajorNumbers(final boolean showNumbers) {
+ showMajorNumbers = showNumbers;
+
+ NumberRuler ruler = getNumberRuler();
+ if (ruler.getOrientation() == Orientation.HORIZONTAL) {
+ invalidateComponent();
+ }
+ }
+
+ /**
+ * @return Whether to display numbers at each minor division
+ * (only for horizontal orientation).
+ */
+ public boolean getShowMinorNumbers() {
+ return showMinorNumbers;
+ }
+
+ /**
+ * Sets the flag to say whether to show numbers at each minor division
+ * (for horizontal orientation only).
+ *
+ * @param showNumbers Whether numbers should be shown for minor divisions.
+ */
+ public final void setShowMinorNumbers(final boolean showNumbers) {
+ showMinorNumbers = showNumbers;
+
+ NumberRuler ruler = getNumberRuler();
+ if (ruler.getOrientation() == Orientation.HORIZONTAL) {
+ invalidateComponent();
+ }
+ }
+
+ /**
+ * @return The font used to render the Ruler's text.
+ */
+ public Font getFont() {
+ return font;
+ }
+
+ /**
+ * Sets the font used in rendering the Ruler's text.
+ *
+ * @param fontValue The new font to use.
+ */
+ public void setFont(final Object fontValue) {
+ font = fontFromObject(fontValue);
+
+ // Make some size calculations for the drawing code
+ FontRenderContext fontRenderContext = Platform.getFontRenderContext();
+ LineMetrics lm = font.getLineMetrics("0", fontRenderContext);
+ charHeight = lm.getAscent();
+ descent = lm.getDescent();
+ lineHeight = (int) Math.ceil(lm.getHeight())
+ + (rowPadding != null ? rowPadding.getHeight() : 0);
+
+ invalidateComponent();
+ }
+
+ /**
+ * Returns the foreground color of the text and markers of the ruler.
+ *
+ * @return The foreground (text and marker) color.
+ */
+ public Color getColor() {
+ return color;
+ }
+
+ /**
+ * Sets the foreground color of the text and markers of the ruler.
+ *
+ * @param colorValue The foreground (that is, the text and marker) color.
+ */
+ public void setColor(final Object colorValue) {
+ color = colorFromObject(colorValue, "color");
+ repaintComponent();
+ }
+
+ /**
+ * Returns the background color of the ruler.
+ *
+ * @return The current background color.
+ */
+ public Color getBackgroundColor() {
+ return backgroundColor;
+ }
+
+ /**
+ * Sets the background color of the ruler.
+ *
+ * @param colorValue New background color value.
+ */
+ public void setBackgroundColor(final Object colorValue) {
+ backgroundColor = colorFromObject(colorValue, "backgroundColor");
+ repaintComponent();
+ }
+
+}
Propchange: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/NumberRulerSkin.java
------------------------------------------------------------------------------
svn:eol-style = native
