You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2013/01/18 19:37:09 UTC
git commit: ISIS-309: minor extensions for wicket viewer API
Updated Branches:
refs/heads/master aa4d32a71 -> 2b44850ee
ISIS-309: minor extensions for wicket viewer API
- removed the ImageResourceCache2 API, since cannot be injected via guice.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2b44850e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2b44850e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2b44850e
Branch: refs/heads/master
Commit: 2b44850ee4bbcb6e366101aa1ccb0c8b11f4e2c8
Parents: aa4d32a
Author: Dan Haywood <da...@apache.org>
Authored: Fri Jan 18 18:36:02 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Fri Jan 18 18:36:02 2013 +0000
----------------------------------------------------------------------
.../viewer/imagecache/ImageCacheClassPath.java | 19 +++-----
.../wicket/model/models/ImageResourceCache2.java | 32 ---------------
.../isis/core/progmodel/app/IsisMetaModel.java | 6 +-
.../dom/src/main/java/dom/todo/ToDoItems.java | 1 -
4 files changed, 10 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2b44850e/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java
index 29671f3..beed0ce 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java
@@ -27,18 +27,14 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import com.google.common.collect.Maps;
-import com.google.inject.Singleton;
-
-import org.apache.wicket.request.resource.IResource;
-import org.apache.wicket.request.resource.PackageResource;
-import org.apache.wicket.request.resource.PackageResourceReference;
-import org.apache.wicket.request.resource.ResourceReference;
-
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
-import org.apache.isis.viewer.wicket.model.models.ImageResourceCache2;
+import org.apache.wicket.request.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
+
+import com.google.common.collect.Maps;
+import com.google.inject.Singleton;
/**
* Caches images loaded up the <tt>images</tt> package (using the {@link Images}
@@ -48,7 +44,7 @@ import org.apache.isis.viewer.wicket.model.models.ImageResourceCache2;
* Searches for a fixed set of suffixes: {@value #IMAGE_SUFFICES}.
*/
@Singleton
-public class ImageCacheClassPath implements ImageResourceCache2 {
+public class ImageCacheClassPath implements ImageResourceCache {
private static final List<String> IMAGE_SUFFICES = Arrays.asList("png", "gif", "jpeg", "jpg");
private static final String FALLBACK_IMAGE = "Default.png";
@@ -61,8 +57,7 @@ public class ImageCacheClassPath implements ImageResourceCache2 {
return resourceReferenceFor(adapter.getSpecification());
}
- @Override
- public ResourceReference resourceReferenceFor(final ObjectSpecification spec) {
+ private ResourceReference resourceReferenceFor(final ObjectSpecification spec) {
ResourceReference resourceReference = resourceReferenceBySpec.get(spec);
if(resourceReference != null) {
return resourceReference;
http://git-wip-us.apache.org/repos/asf/isis/blob/2b44850e/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache2.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache2.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache2.java
deleted file mode 100644
index 7ba90f0..0000000
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache2.java
+++ /dev/null
@@ -1,32 +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.isis.viewer.wicket.model.models;
-
-import org.apache.wicket.request.resource.ResourceReference;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-
-// separate interface to avoid bumping up the x in x.y.z
-public interface ImageResourceCache2 extends ImageResourceCache {
-
- ResourceReference resourceReferenceFor(ObjectSpecification spec);
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/2b44850e/core/metamodel/src/main/java/org/apache/isis/core/progmodel/app/IsisMetaModel.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/app/IsisMetaModel.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/app/IsisMetaModel.java
index 47ba2f3..7f94f01 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/app/IsisMetaModel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/app/IsisMetaModel.java
@@ -180,14 +180,14 @@ public class IsisMetaModel implements ApplicationScopedComponent {
runtimeContext.injectInto(reflector);
reflector.injectInto(runtimeContext);
+ validationFailures = reflector.initAndValidate();
+ runtimeContext.init();
+
for (final Object service : services) {
final ObjectSpecification serviceSpec = reflector.loadSpecification(service.getClass());
serviceSpec.markAsService();
}
- validationFailures = reflector.initAndValidate();
- runtimeContext.init();
-
state = State.INITIALIZED;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/2b44850e/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItems.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItems.java b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItems.java
index 1c94c32..09f7844 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItems.java
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItems.java
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.isis.applib.AbstractFactoryAndRepository;
import org.apache.isis.applib.annotation.ActionSemantics;
import org.apache.isis.applib.annotation.ActionSemantics.Of;
-import org.apache.isis.applib.annotation.Bulk;
import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Named;