summaryrefslogtreecommitdiffstats
path: root/ajde/src
diff options
context:
space:
mode:
authormkersten <mkersten>2003-08-06 21:17:57 +0000
committermkersten <mkersten>2003-08-06 21:17:57 +0000
commit5edccbfaeb8bb4dc5b34d553267365ae3c7eda41 (patch)
tree7fe52f8582e5a0240443801f2003b09117b419de /ajde/src
parent3b729301c726c44f028906ec53e518e2d3081e83 (diff)
downloadaspectj-5edccbfaeb8bb4dc5b34d553267365ae3c7eda41.tar.gz
aspectj-5edccbfaeb8bb4dc5b34d553267365ae3c7eda41.zip
Fixed bugs:
40943: Binary weaving should copy non-Java resources from "-inja... 36071: 1.1 rc1 should copy resources similar to java compiler 40826: ajbrowser does not report errors properly 40774: task list icons don't show in ajbrowser
Diffstat (limited to 'ajde/src')
-rw-r--r--ajde/src/org/aspectj/ajde/ProjectPropertiesAdapter.java13
-rw-r--r--ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java1
-rw-r--r--ajde/src/org/aspectj/ajde/ui/swing/CompilerMessage.java34
-rw-r--r--ajde/src/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java2
4 files changed, 13 insertions, 37 deletions
diff --git a/ajde/src/org/aspectj/ajde/ProjectPropertiesAdapter.java b/ajde/src/org/aspectj/ajde/ProjectPropertiesAdapter.java
index fd63560e3..2934932ee 100644
--- a/ajde/src/org/aspectj/ajde/ProjectPropertiesAdapter.java
+++ b/ajde/src/org/aspectj/ajde/ProjectPropertiesAdapter.java
@@ -16,8 +16,7 @@
package org.aspectj.ajde;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
/**
* @author Mik Kersten
@@ -70,6 +69,16 @@ public interface ProjectPropertiesAdapter {
public Set getInJars();
/**
+ * Get the set of non-Java resources for this compilation.
+ * Set members should be of type java.io.File.
+ * An empty set or null is acceptable for this option.
+ * From -injars.
+ *
+ * @return map from unique resource name to absolute path to source resource (String to File)
+ */
+ public Map getSourcePathResources();
+
+ /**
* Get the output jar file for the compilation results.
* Return null to leave classfiles unjar'd in output directory
* From -outjar
diff --git a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
index d77aee408..c1b838e28 100644
--- a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
+++ b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
@@ -488,6 +488,7 @@ public class CompilerAdapter {
join(config.getSourceRoots(), properties.getSourceRoots());
join(config.getInJars(), properties.getInJars());
+ config.setSourcePathResources(properties.getSourcePathResources());
join(config.getAspectpath(), properties.getAspectPath());
}
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessage.java b/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessage.java
deleted file mode 100644
index 9ca312d83..000000000
--- a/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessage.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation,
- * 2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved.
- * This program and the accompanying materials are made available
- * under the terms of the Common Public License v1.0
- * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Xerox/PARC initial implementation
- * ******************************************************************/
-
-
-package org.aspectj.ajde.ui.swing;
-
-import org.aspectj.bridge.IMessage;
-import org.aspectj.util.LangUtil;
-
-/**
- * @author Mik Kersten
- */
-public class CompilerMessage {
- public final IMessage message;
-
- public CompilerMessage(IMessage message) {
- LangUtil.throwIaxIfNull(message, "message");
- this.message = message;
- }
-
- public String toString() {
- return message.toString();
- }
- }
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java b/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java
index 650eaaae5..9476f3b4e 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java
@@ -36,7 +36,7 @@ public class CompilerMessagesCellRenderer extends JLabel implements ListCellRend
boolean cellHasFocus) {
String label = "<no message>";
String detail = null;
- IMessage.Kind kind = IMessage.INFO;
+ IMessage.Kind kind = IMessage.ERROR;
if (value instanceof IMessage) {
IMessage cm = (IMessage) value;
label = cm.getMessage();