This repository has been archived by the owner on Feb 9, 2021. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
UF-229: Configurable Workbench: Dynamic Screens are not properly disp…
…layed in Editor Screen on LayoutEditor - Also adds refactoring that introduces new Activity.getIdentifier() method
- Loading branch information
Showing
71 changed files
with
619 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
...ch/uberfire-workbench-client/src/main/java/org/uberfire/client/mvp/ActivityBeansInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Copyright 2015 JBoss Inc | ||
| * | ||
| * Licensed 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.uberfire.client.mvp; | ||
|
|
||
| import org.jboss.errai.ioc.client.container.IOC; | ||
| import org.jboss.errai.ioc.client.container.IOCBeanDef; | ||
| import org.jboss.errai.ioc.client.container.SyncBeanManager; | ||
|
|
||
| import javax.enterprise.context.ApplicationScoped; | ||
| import javax.inject.Named; | ||
| import java.lang.annotation.Annotation; | ||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
|
|
||
| @ApplicationScoped | ||
| public class ActivityBeansInfo { | ||
|
|
||
| public List<String> getAvailableWorkbenchScreensIds() { | ||
| return lookupBeansId( WorkbenchScreenActivity.class ); | ||
| } | ||
|
|
||
| public List<String> getAvailablePerspectivesIds() { | ||
| return lookupBeansId( PerspectiveActivity.class ); | ||
| } | ||
|
|
||
| public List<String> getAvailableSplashScreensIds() { | ||
| return lookupBeansId( SplashScreenActivity.class ); | ||
| } | ||
|
|
||
| public List<String> getAvailableWorkbenchEditorsIds() { | ||
| return lookupBeansId( WorkbenchEditorActivity.class ); | ||
| } | ||
|
|
||
| private List<String> lookupBeansId( Class<?> activityClass ) { | ||
| final Collection<? extends IOCBeanDef<?>> screens = getBeanManager().lookupBeans( activityClass ); | ||
| List<String> result = new ArrayList<String>(); | ||
| for (final IOCBeanDef<?> beanDef : screens) { | ||
| result.add( getId( beanDef ) ); | ||
| } | ||
| Collections.sort( result ); | ||
| return result; | ||
| } | ||
|
|
||
| SyncBeanManager getBeanManager() { | ||
| return IOC.getBeanManager(); | ||
| } | ||
|
|
||
|
|
||
| private String getId( final IOCBeanDef<?> beanDef ) { | ||
| for (final Annotation annotation : beanDef.getQualifiers()) { | ||
| if (isNamed( annotation )) { | ||
| return ((Named) annotation).value(); | ||
| } | ||
| } | ||
| if (hasBeanName( beanDef )) { | ||
| return beanDef.getName(); | ||
| } | ||
| return ""; | ||
| } | ||
|
|
||
| boolean isNamed( Annotation annotation ) { | ||
| return annotation instanceof Named; | ||
| } | ||
|
|
||
| private boolean hasBeanName( IOCBeanDef<?> beanDef ) { | ||
| return beanDef.getName() != null && !beanDef.getName().isEmpty(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
151 changes: 151 additions & 0 deletions
151
...berfire-workbench-client/src/test/java/org/uberfire/client/mvp/ActivityBeansInfoTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| /* | ||
| * Copyright 2015 JBoss Inc | ||
| * | ||
| * Licensed 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.uberfire.client.mvp; | ||
|
|
||
| import org.jboss.errai.ioc.client.container.CreationalContext; | ||
| import org.jboss.errai.ioc.client.container.IOCBeanDef; | ||
| import org.jboss.errai.ioc.client.container.SyncBeanManager; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.mockito.Mock; | ||
|
|
||
| import javax.inject.Named; | ||
| import java.lang.annotation.Annotation; | ||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.HashSet; | ||
| import java.util.Set; | ||
|
|
||
| import static org.junit.Assert.*; | ||
| import static org.mockito.Matchers.anyObject; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| public class ActivityBeansInfoTest { | ||
|
|
||
| private SyncBeanManager syncBeanManager; | ||
|
|
||
| private ActivityBeansInfo activityBeansInfo; | ||
|
|
||
| @Before | ||
| public void setup(){ | ||
| syncBeanManager = mock( SyncBeanManager.class ); | ||
| activityBeansInfo = new ActivityBeansInfo(){ | ||
| @Override | ||
| SyncBeanManager getBeanManager() { | ||
| return syncBeanManager; | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| @Test | ||
| public void getAvaliableWorkbenchScreensIdsTest(){ | ||
| when( syncBeanManager.lookupBeans( WorkbenchScreenActivity.class ) ) | ||
| .thenReturn( generateBeansList() ); | ||
|
|
||
| assertEquals( 2 , activityBeansInfo.getAvailableWorkbenchScreensIds().size() ); | ||
| //assert bean order | ||
| assertEquals( "A" , activityBeansInfo.getAvailableWorkbenchScreensIds().get( 0 ) ); | ||
| assertEquals( "Z" , activityBeansInfo.getAvailableWorkbenchScreensIds().get( 1 ) ); | ||
|
|
||
| } | ||
|
|
||
| private Collection<IOCBeanDef<WorkbenchScreenActivity>> generateBeansList() { | ||
| Collection<IOCBeanDef<WorkbenchScreenActivity>> beans = new ArrayList<IOCBeanDef<WorkbenchScreenActivity>>( ); | ||
|
|
||
| beans.add( generateBeanDef( "Z", true ) ); | ||
| beans.add( generateBeanDef( "A", false ) ); | ||
|
|
||
| return beans; | ||
| } | ||
|
|
||
| private IOCBeanDef<WorkbenchScreenActivity> generateBeanDef(String beanName, final boolean hasAnnotations) { | ||
| return new IOCBeanDef<WorkbenchScreenActivity>() { | ||
| @Override | ||
| public Class<WorkbenchScreenActivity> getType() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public Class<?> getBeanClass() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public Class<? extends Annotation> getScope() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public WorkbenchScreenActivity getInstance() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public WorkbenchScreenActivity getInstance( CreationalContext context ) { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public WorkbenchScreenActivity newInstance() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public Set<Annotation> getQualifiers() { | ||
| final HashSet<Annotation> annotations = new HashSet<Annotation>(); | ||
| if( hasAnnotations ){ | ||
| annotations.add( new Named(){ | ||
|
|
||
| @Override | ||
| public Class<? extends Annotation> annotationType() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public String value() { | ||
| return "Z"; | ||
| } | ||
| } ); | ||
| } | ||
| return annotations; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean matches( Set<Annotation> annotations ) { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public String getName() { | ||
| return "A"; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isConcrete() { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isActivated() { | ||
| return false; | ||
| } | ||
| }; | ||
| } | ||
|
|
||
|
|
||
| } |
Oops, something went wrong.