You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2013/02/15 22:04:33 UTC
[3/7] git commit: DELTASPIKE-288
org.apache.deltaspike.core.api.config.view.View -> ViewRef
DELTASPIKE-288 org.apache.deltaspike.core.api.config.view.View -> ViewRef
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/454eb938
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/454eb938
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/454eb938
Branch: refs/heads/master
Commit: 454eb938264fddec52e032b1b0e0597a63e6e511
Parents: 3255ce4
Author: gpetracek <gp...@apache.org>
Authored: Fri Feb 15 20:47:11 2013 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Fri Feb 15 20:47:11 2013 +0100
----------------------------------------------------------------------
.../deltaspike/core/api/config/view/Matches.java | 2 +-
.../deltaspike/core/api/config/view/View.java | 52 ---------------
.../deltaspike/core/api/config/view/ViewRef.java | 52 +++++++++++++++
.../jsf/impl/config/view/ViewConfigExtension.java | 6 +-
.../config/view/controller/uc003/PageBean003.java | 4 +-
5 files changed, 58 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/454eb938/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/Matches.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/Matches.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/Matches.java
index a792d80..41e753b 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/Matches.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/Matches.java
@@ -36,7 +36,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
@ViewMetaData
public @interface Matches
{
- Class<? extends ViewConfig>[] value() default View.Manual.class;
+ Class<? extends ViewConfig>[] value() default ViewRef.Manual.class;
//no array or Matches.List needed because it's possible to specify different rules -> only one pattern per rule
String pattern() default "*";
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/454eb938/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/View.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/View.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/View.java
deleted file mode 100644
index 5389891..0000000
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/View.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.deltaspike.core.api.config.view;
-
-import javax.enterprise.util.Nonbinding;
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Allows to reference a view-config
- */
-
-@Target({ TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-
-//cdi annotations
-//TODO discuss and implement it (also discuss @InterceptorBinding)
-public @interface View
-{
- abstract class Manual implements ViewConfig
- {
- }
-
- /**
- * Specifies the pages via type-safe {@link ViewConfig}.
- *
- * @return views which should be aware of the bean or observer
- */
- @Nonbinding Class<? extends ViewConfig>[] config();
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/454eb938/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/ViewRef.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/ViewRef.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/ViewRef.java
new file mode 100644
index 0000000..b99a8b4
--- /dev/null
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/ViewRef.java
@@ -0,0 +1,52 @@
+/*
+ * 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.deltaspike.core.api.config.view;
+
+import javax.enterprise.util.Nonbinding;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * Allows to reference a view-config
+ */
+
+@Target({ TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+
+//cdi annotations
+//TODO discuss and implement it (also discuss @InterceptorBinding)
+public @interface ViewRef
+{
+ abstract class Manual implements ViewConfig
+ {
+ }
+
+ /**
+ * Specifies the pages via type-safe {@link ViewConfig}.
+ *
+ * @return views which should be aware of the bean or observer
+ */
+ @Nonbinding Class<? extends ViewConfig>[] config();
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/454eb938/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java
index d9b863d..d4e3ea6 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.jsf.impl.config.view;
-import org.apache.deltaspike.core.api.config.view.View;
+import org.apache.deltaspike.core.api.config.view.ViewRef;
import org.apache.deltaspike.core.api.config.view.ViewConfig;
import org.apache.deltaspike.core.api.config.view.metadata.ViewConfigResolver;
import org.apache.deltaspike.core.spi.activation.Deactivatable;
@@ -93,9 +93,9 @@ public class ViewConfigExtension implements Extension, Deactivatable
{
for (Annotation annotation : annotations)
{
- if (annotation.annotationType().equals(View.class))
+ if (annotation.annotationType().equals(ViewRef.class))
{
- for (Class<? extends ViewConfig> viewConfigRef : ((View) annotation).config())
+ for (Class<? extends ViewConfig> viewConfigRef : ((ViewRef) annotation).config())
{
ViewConfigNode viewConfigNode = findNode(viewConfigRef);
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/454eb938/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/PageBean003.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/PageBean003.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/PageBean003.java
index 089cd09..5712ad4 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/PageBean003.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/PageBean003.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.jsf.impl.config.view.controller.uc003;
-import org.apache.deltaspike.core.api.config.view.View;
+import org.apache.deltaspike.core.api.config.view.ViewRef;
import org.apache.deltaspike.jsf.api.config.view.controller.InitView;
import org.apache.deltaspike.jsf.api.config.view.controller.PrePageAction;
import org.apache.deltaspike.jsf.api.config.view.controller.PreRenderView;
@@ -26,7 +26,7 @@ import org.apache.deltaspike.jsf.api.config.view.controller.PreRenderView;
import javax.enterprise.inject.Model;
@Model
-@View(config = SimplePageConfig.class)
+@ViewRef(config = SimplePageConfig.class)
class PageBean003
{
@InitView