Author: rwhitcomb
Date: Tue Jul 21 16:00:51 2015
New Revision: 1692157
URL: http://svn.apache.org/r1692157
Log:
PIVOT-975: Build problems with Java 1.8.0_45
First, enable Java 1.8 as a valid Java version number.
Then, there are errors related to LocalManifestAdapter being a second
class within the LocalManifest.java file. It should be moved to its
own source file.
Added:
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/LocalManifestAdapter.java
Modified:
pivot/branches/2.0.x/build.xml
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/LocalManifest.java
Modified: pivot/branches/2.0.x/build.xml
URL:
http://svn.apache.org/viewvc/pivot/branches/2.0.x/build.xml?rev=1692157&r1=1692156&r2=1692157&view=diff
==============================================================================
--- pivot/branches/2.0.x/build.xml (original)
+++ pivot/branches/2.0.x/build.xml Tue Jul 21 16:00:51 2015
@@ -113,6 +113,7 @@ limitations under the License.
<or>
<equals arg1="${ant.java.version}" arg2="1.6"/>
<equals arg1="${ant.java.version}" arg2="1.7"/>
+ <equals arg1="${ant.java.version}" arg2="1.8"/>
</or>
</not>
</condition>
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/LocalManifest.java
URL:
http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/LocalManifest.java?rev=1692157&r1=1692156&r2=1692157&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/LocalManifest.java
(original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/LocalManifest.java Tue
Jul 21 16:00:51 2015
@@ -106,73 +106,3 @@ public class LocalManifest implements Ma
}
}
-class LocalManifestAdapter implements Transferable {
- private LocalManifest localManifest;
- private ArrayList<DataFlavor> transferDataFlavors = new
ArrayList<DataFlavor>();
-
- private static final String URI_LIST_MIME_TYPE = "text/uri-list;
class=java.lang.String";
-
- public LocalManifestAdapter(LocalManifest localManifest) {
- this.localManifest = localManifest;
-
- if (localManifest.containsText()) {
- transferDataFlavors.add(DataFlavor.stringFlavor);
- }
-
- if (localManifest.containsImage()) {
- transferDataFlavors.add(DataFlavor.imageFlavor);
- }
-
- if (localManifest.containsFileList()) {
- transferDataFlavors.add(DataFlavor.javaFileListFlavor);
-
- try {
- transferDataFlavors.add(new DataFlavor(URI_LIST_MIME_TYPE));
- } catch (ClassNotFoundException exception) {
- // No-op
- }
- }
- }
-
- @Override
- public Object getTransferData(DataFlavor dataFlavor)
- throws UnsupportedFlavorException {
- Object transferData = null;
-
- int index = transferDataFlavors.indexOf(dataFlavor);
- if (index == -1) {
- throw new UnsupportedFlavorException(dataFlavor);
- }
-
- if (dataFlavor.equals(DataFlavor.stringFlavor)) {
- transferData = localManifest.getText();
- } else if (dataFlavor.equals(DataFlavor.imageFlavor)) {
- Picture picture = (Picture)localManifest.getImage();
- transferData = picture.getBufferedImage();
- } else if (dataFlavor.equals(DataFlavor.javaFileListFlavor)) {
- FileList fileList = localManifest.getFileList();
- transferData = fileList.getList();
- } else if (dataFlavor.getMimeType().equals(URI_LIST_MIME_TYPE)) {
- FileList fileList = localManifest.getFileList();
-
- StringBuilder buf = new StringBuilder();
- for (File file : fileList) {
- buf.append(file.toURI().toString()).append("\r\n");
- }
-
- transferData = buf.toString();
- }
-
- return transferData;
- }
-
- @Override
- public DataFlavor[] getTransferDataFlavors() {
- return transferDataFlavors.toArray(DataFlavor[].class);
- }
-
- @Override
- public boolean isDataFlavorSupported(DataFlavor dataFlavor) {
- return (transferDataFlavors.indexOf(dataFlavor) != -1);
- }
-}
Added:
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/LocalManifestAdapter.java
URL:
http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/LocalManifestAdapter.java?rev=1692157&view=auto
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/LocalManifestAdapter.java
(added)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/LocalManifestAdapter.java
Tue Jul 21 16:00:51 2015
@@ -0,0 +1,101 @@
+/*
+ * 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 java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.File;
+
+import org.apache.pivot.collections.ArrayList;
+import org.apache.pivot.io.FileList;
+import org.apache.pivot.wtk.media.Picture;
+
+/**
+ * Manifest class that serves as data source for a clipboard or drag/drop
+ * operation.
+ */
+public class LocalManifestAdapter implements Transferable {
+ private LocalManifest localManifest;
+ private ArrayList<DataFlavor> transferDataFlavors = new
ArrayList<DataFlavor>();
+
+ private static final String URI_LIST_MIME_TYPE = "text/uri-list;
class=java.lang.String";
+
+ public LocalManifestAdapter(LocalManifest localManifest) {
+ this.localManifest = localManifest;
+
+ if (localManifest.containsText()) {
+ transferDataFlavors.add(DataFlavor.stringFlavor);
+ }
+
+ if (localManifest.containsImage()) {
+ transferDataFlavors.add(DataFlavor.imageFlavor);
+ }
+
+ if (localManifest.containsFileList()) {
+ transferDataFlavors.add(DataFlavor.javaFileListFlavor);
+
+ try {
+ transferDataFlavors.add(new DataFlavor(URI_LIST_MIME_TYPE));
+ } catch (ClassNotFoundException exception) {
+ // No-op
+ }
+ }
+ }
+
+ @Override
+ public Object getTransferData(DataFlavor dataFlavor)
+ throws UnsupportedFlavorException {
+ Object transferData = null;
+
+ int index = transferDataFlavors.indexOf(dataFlavor);
+ if (index == -1) {
+ throw new UnsupportedFlavorException(dataFlavor);
+ }
+
+ if (dataFlavor.equals(DataFlavor.stringFlavor)) {
+ transferData = localManifest.getText();
+ } else if (dataFlavor.equals(DataFlavor.imageFlavor)) {
+ Picture picture = (Picture)localManifest.getImage();
+ transferData = picture.getBufferedImage();
+ } else if (dataFlavor.equals(DataFlavor.javaFileListFlavor)) {
+ FileList fileList = localManifest.getFileList();
+ transferData = fileList.getList();
+ } else if (dataFlavor.getMimeType().equals(URI_LIST_MIME_TYPE)) {
+ FileList fileList = localManifest.getFileList();
+
+ StringBuilder buf = new StringBuilder();
+ for (File file : fileList) {
+ buf.append(file.toURI().toString()).append("\r\n");
+ }
+
+ transferData = buf.toString();
+ }
+
+ return transferData;
+ }
+
+ @Override
+ public DataFlavor[] getTransferDataFlavors() {
+ return transferDataFlavors.toArray(DataFlavor[].class);
+ }
+
+ @Override
+ public boolean isDataFlavorSupported(DataFlavor dataFlavor) {
+ return (transferDataFlavors.indexOf(dataFlavor) != -1);
+ }
+}
