Merge pull request #890 from thiagobustamante/master

Issues on Factories
CruxFramework · Nov 20, 2015 · d37f003 · d37f003
2 parents 7ffaf84 + b7177be
commit d37f003
Show file tree

Hide file tree

Showing 40 changed files with 368 additions and 390 deletions.
diff --git a/crux-dev/src/main/java/org/cruxframework/crux/core/client/image/GWTFixImage.java b/crux-dev/src/main/java/org/cruxframework/crux/core/client/image/GWTFixImage.java
@@ -102,7 +102,7 @@ public void execute()
 						@Override
 						public void callHowToImplementInnerSetVisibleRect() 
 						{
-							image.setUrl(Screen.rewriteUrl(url));		
+							image.setUrl(url);		
 						}
 					};
 				}

diff --git a/.../main/java/org/cruxframework/crux/core/client/permission/DefaultPermissionsUIHandler.java b/.../main/java/org/cruxframework/crux/core/client/permission/DefaultPermissionsUIHandler.java
@@ -36,12 +36,6 @@ public void markAsUnauthorizedForEdition(HasEnabled widget)
 		((IsWidget)widget).asWidget().addStyleDependentName("disabled");
     }
 
-	@Override
-    public void markAsUnauthorizedForViewing(IsWidget widget)
-    {
-		widget.asWidget().setVisible(false);
-    }
-
 	@Override
 	public void markAsUnauthorizedForViewing(UIObject uiObject)
 	{

diff --git a/crux-dev/src/main/java/org/cruxframework/crux/core/client/permission/Permissions.java b/crux-dev/src/main/java/org/cruxframework/crux/core/client/permission/Permissions.java
@@ -17,7 +17,6 @@
 
 import com.google.gwt.core.shared.GWT;
 import com.google.gwt.user.client.ui.HasEnabled;
-import com.google.gwt.user.client.ui.IsWidget;
 import com.google.gwt.user.client.ui.UIObject;
 
 /**
@@ -49,15 +48,6 @@ public static void markAsUnauthorizedForEdition(HasEnabled widget)
 		getPermissionsUIHandler().markAsUnauthorizedForEdition(widget);
 	}
 
-	/**
-	 * Notify the given widget that current user has no role for view its contents
-	 * @param widget
-	 */
-	public static void markAsUnauthorizedForViewing(IsWidget widget)
-	{
-		getPermissionsUIHandler().markAsUnauthorizedForViewing(widget);
-	}
-
 	/**
 	 * Notify the given uiObject that current user has no role for view its contents
 	 * @param uiObject

diff --git a/...dev/src/main/java/org/cruxframework/crux/core/client/permission/PermissionsUIHandler.java b/...dev/src/main/java/org/cruxframework/crux/core/client/permission/PermissionsUIHandler.java
@@ -16,7 +16,6 @@
 package org.cruxframework.crux.core.client.permission;
 
 import com.google.gwt.user.client.ui.HasEnabled;
-import com.google.gwt.user.client.ui.IsWidget;
 import com.google.gwt.user.client.ui.UIObject;
 
 /**
@@ -32,12 +31,6 @@ public interface PermissionsUIHandler
 	 */
 	void markAsUnauthorizedForEdition(HasEnabled widget);
 
-	/**
-	 * Notify the given widget that current user has no role for view its contents
-	 * @param widget
-	 */
-	void markAsUnauthorizedForViewing(IsWidget widget);
-
 	/**
 	 * Notify the given uiObject that current user has no role for view its contents
 	 * @param uiObject

diff --git a/crux-dev/src/main/java/org/cruxframework/crux/core/client/screen/Screen.java b/crux-dev/src/main/java/org/cruxframework/crux/core/client/screen/Screen.java
@@ -63,7 +63,6 @@ public class Screen
 	protected RootViewContainer rootViewContainer = null;
 	protected FastList<Element> blockingDivs = new FastList<Element>();
 	protected String id;
-	protected URLRewriter urlRewriter = GWT.create(URLRewriter.class);
 	private static HandlerRegistration refreshPreviewHandler;
 
     protected Screen(final String id) 
@@ -278,12 +277,7 @@ protected boolean containsWidget(String id)
 	{
 		return getView().containsWidget(id);
 	}
-
-	protected String rewriteURL(String url)
-	{
-		return urlRewriter.rewrite(url);
-	}
-
+
 	/**
 	 * Creates and shows a DIV over the screen contents
 	 * @param blockingDivStyleName
@@ -416,16 +410,10 @@ public static void addToHistory(String token, boolean issueEvent)
 	 * @param url
 	 * @return
 	 */
+	@Deprecated
+	@Legacy
 	public static String rewriteUrl(String url)
 	{
-		try
-		{
-			return Screen.get().rewriteURL(url);
-		}
-		catch(Throwable e)
-		{
-			logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
-		}
 		return url;
 	}