inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

. WCM HEAD merge fixes

Browse Source 
- fix ups
 - removal of obsolete JBPM files

. Addition of AVM JavaScript integation files
 - ability to retrieve AVM node references by Path or from the root node of a store by lookup
 - getting and setting of AVM node properties and aspects
 - walking of child nodes
 - moving and renaming of AVM nodes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4311 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-11-08 11:10:10 +00:00
parent 64c6e1809a
commit 01fe4b13ce
5 changed files with 9 additions and 987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
source/java/org/alfresco/web/config/ClientConfigElement.java
View File

@@ -40,15 +40,10 @@ public class ClientConfigElement extends ConfigElementAdapter
private String helpUrl = null;
private String editLinkType = "http";
private String homeSpacePermission = null;
<<<<<<< .working
private boolean ajaxEnabled = false;
private String initialLocation = "myalfresco";
private String wcmDomain = null;
private String wcmPort = null;
=======
private boolean ajaxEnabled = false;
private String initialLocation = "myalfresco";
>>>>>>> .merge-right.r4305
/**
* Default Constructor
@@ -143,34 +138,22 @@ public class ClientConfigElement extends ConfigElementAdapter
combinedElement.setSearchMaxResults(newElement.getSearchMaxResults());
}
<<<<<<< .working
if (newElement.isShelfVisible() != combinedElement.isShelfVisible())
=======
if (newElement.getSelectorsSearchMaxResults() != combinedElement.getSelectorsSearchMaxResults())
>>>>>>> .merge-right.r4305
{
<<<<<<< .working
combinedElement.setShelfVisible(newElement.isShelfVisible());
=======
combinedElement.setSelectorsSearchMaxResults(newElement.getSelectorsSearchMaxResults());
>>>>>>> .merge-right.r4305
}
<<<<<<< .working
if (newElement.isShelfVisible() != combinedElement.isShelfVisible())
{
combinedElement.setShelfVisible(newElement.isShelfVisible());
}
if (newElement.getFromEmailAddress() != null &&
(newElement.getFromEmailAddress().equals(combinedElement.getFromEmailAddress()) == false))
=======
if (newElement.isShelfVisible() != combinedElement.isShelfVisible())
>>>>>>> .merge-right.r4305
{
<<<<<<< .working
combinedElement.setFromEmailAddress(newElement.getFromEmailAddress());
=======
combinedElement.setShelfVisible(newElement.isShelfVisible());
>>>>>>> .merge-right.r4305
}
<<<<<<< .working
if (newElement.isAjaxEnabled() != combinedElement.isAjaxEnabled())
{
combinedElement.setAjaxEnabled(newElement.isAjaxEnabled());
@@ -201,26 +184,6 @@ public class ClientConfigElement extends ConfigElementAdapter
}
return combinedElement;
=======
if (newElement.getFromEmailAddress() != null &&
(newElement.getFromEmailAddress().equals(combinedElement.getFromEmailAddress()) == false))
{
combinedElement.setFromEmailAddress(newElement.getFromEmailAddress());
}
if (newElement.isAjaxEnabled() != combinedElement.isAjaxEnabled())
{
combinedElement.setAjaxEnabled(newElement.isAjaxEnabled());
}
if (newElement.getInitialLocation() != null &&
newElement.getInitialLocation().equals(combinedElement.getInitialLocation()) == false)
{
combinedElement.setInitialLocation(newElement.getInitialLocation());
}
return combinedElement;
>>>>>>> .merge-right.r4305
}
/**
@@ -427,7 +390,6 @@ public class ClientConfigElement extends ConfigElementAdapter
{
this.homeSpacePermission = homeSpacePermission;
}
<<<<<<< .working
/**
* @return Returns whether AJAX support is enabled in the client
@@ -494,40 +456,4 @@ public class ClientConfigElement extends ConfigElementAdapter
{
this.wcmPort = wcmPort;
}
=======
/**
* @return Returns whether AJAX support is enabled in the client
*/
public boolean isAjaxEnabled()
{
return this.ajaxEnabled;
}
/**
* Sets whether AJAX support is enabled in the client
*
* @param ajaxEnabled
*/
/*package*/ void setAjaxEnabled(boolean ajaxEnabled)
{
this.ajaxEnabled = ajaxEnabled;
}
/**
* @return Returns the default initial location for the user.
*/
public String getInitialLocation()
{
return this.initialLocation;
}
/**
* @param initialLocation The initial location to set.
*/
/*package*/ void setInitialLocation(String initialLocation)
{
this.initialLocation = initialLocation;
}
>>>>>>> .merge-right.r4305
}