Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issues on Factories #890

Merged
merged 10 commits into from
Nov 20, 2015
Merged

Issues on Factories #890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2354915
Issue #886
thiagobustamante Nov 19, 2015
6a1bdd2
IGNORE - remove old code
thiagobustamante Nov 19, 2015
bdcab87
Issue #887
thiagobustamante Nov 19, 2015
9aff399
Issue #887
thiagobustamante Nov 19, 2015
1a45b98
Issue #887
thiagobustamante Nov 19, 2015
e87a15a
Issue #887
thiagobustamante Nov 19, 2015
4a7d9d4
Issue #887
thiagobustamante Nov 19, 2015
ff9d420
Issue #889
thiagobustamante Nov 20, 2015
5a84a80
Issue #889
thiagobustamante Nov 20, 2015
b7177be
Merge remote-tracking branch 'upstream/master'
thiagobustamante Nov 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crux-dev/src/main/java/org/cruxframework/crux/core/client/image/GWTFixImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public void execute()
@Override
public void callHowToImplementInnerSetVisibleRect()
{
image.setUrl(Screen.rewriteUrl(url));
image.setUrl(url);
}
};
}
Expand Down
6 changes: 0 additions & 6 deletions .../main/java/org/cruxframework/crux/core/client/permission/DefaultPermissionsUIHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
10 changes: 0 additions & 10 deletions crux-dev/src/main/java/org/cruxframework/crux/core/client/permission/Permissions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions ...dev/src/main/java/org/cruxframework/crux/core/client/permission/PermissionsUIHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -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
Expand Down
18 changes: 3 additions & 15 deletions crux-dev/src/main/java/org/cruxframework/crux/core/client/screen/Screen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
}

Expand Down
Loading