Skip to content

Commit

Permalink
Source formatting - sort
Browse files Browse the repository at this point in the history
  • Loading branch information
hhuijser authored and brianchandotcom committed Jan 26, 2012
1 parent 8dcb94c commit 64d3d42
Show file tree
Hide file tree
Showing 15 changed files with 101 additions and 101 deletions.
8 changes: 4 additions & 4 deletions portal-impl/src/com/liferay/mail/util/FuseMailHook.java
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,10 @@ protected int executeMethod(PostMethod method) throws Exception {
return status;
}

protected HttpClient getHttpClient() {
return _client;
}

protected String getMailUserId(long companyId, long userId)
throws Exception {

Expand All @@ -199,10 +203,6 @@ protected String getMailUserId(long companyId, long userId)
return mailUserId;
}

protected HttpClient getHttpClient() {
return _client;
}

protected PostMethod getPostMethod() {
PostMethod post = new PostMethod(_URL);

Expand Down
6 changes: 3 additions & 3 deletions portal-impl/src/com/liferay/portal/model/impl/DummyImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ public Serializable getPrimaryKeyObj() {
return StringPool.BLANK;
}

public void setPrimaryKeyObj(Serializable primaryKeyObj) {
}

@Override
public void resetOriginalValues() {
}

public void setPrimaryKeyObj(Serializable primaryKeyObj) {
}

public String toXmlString() {
return StringPool.BLANK;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,32 +31,32 @@ public EventDefinitionImpl(
_portletApp = portletApp;
}

public QName getQName() {
return _qName;
public PortletApp getPortletApp() {
return _portletApp;
}

public void setQName(QName qName) {
_qName = qName;
public QName getQName() {
return _qName;
}

public String getValueType() {
return _valueType;
}

public void setValueType(String valueType) {
_valueType = valueType;
public void setPortletApp(PortletApp portletApp) {
_portletApp = portletApp;
}

public PortletApp getPortletApp() {
return _portletApp;
public void setQName(QName qName) {
_qName = qName;
}

public void setPortletApp(PortletApp portletApp) {
_portletApp = portletApp;
public void setValueType(String valueType) {
_valueType = valueType;
}

private PortletApp _portletApp;
private QName _qName;
private String _valueType;
private PortletApp _portletApp;

}
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,10 @@ public String getDBName() {
return _dbName;
}

public String getEJBName() {
return _ejbName;
}

public String getHumanCondition(boolean arrayable) {
StringBundler sb = new StringBundler();

Expand Down Expand Up @@ -147,10 +151,6 @@ public String getHumanNames() {
return TextFormatter.formatPlural(getHumanName());
}

public String getEJBName() {
return _ejbName;
}

public String getIdParam() {
return _idParam;
}
Expand Down
8 changes: 4 additions & 4 deletions portal-impl/src/com/liferay/portal/xml/ElementImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -369,14 +369,14 @@ public String getNamespacePrefix() {
return _element.getNamespacePrefix();
}

public String getNamespaceURI() {
return _element.getNamespaceURI();
}

public List<Namespace> getNamespacesForURI(String uri) {
return SAXReaderImpl.toNewNamespaces(_element.getNamespacesForURI(uri));
}

public String getNamespaceURI() {
return _element.getNamespaceURI();
}

public QName getQName() {
org.dom4j.QName qName = _element.getQName();

Expand Down
8 changes: 4 additions & 4 deletions portal-impl/src/com/liferay/portlet/EventRequestImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ public Event getEvent() {
return _event;
}

public void setEvent(Event event) {
_event = event;
}

@Override
public String getLifecycle() {
return PortletRequest.EVENT_PHASE;
}

public void setEvent(Event event) {
_event = event;
}

private Event _event;

}
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ public void setFileVersion(DLFileVersion dlFileVersion) {

private static Log _log = LogFactoryUtil.getLog(DLFileEntryImpl.class);

private UnicodeProperties _extraSettingsProperties;
private DLFileVersion _dlFileVersion;
private UnicodeProperties _extraSettingsProperties;

}
Original file line number Diff line number Diff line change
Expand Up @@ -108,18 +108,6 @@ public InputStream getDocumentInputStream(
return fileEntry.getContentStream();
}

@Override
public Tree getDocumentTree(SharepointRequest sharepointRequest)
throws Exception {

String documentPath = sharepointRequest.getRootPath();
String parentFolderPath = getParentFolderPath(documentPath);

FileEntry fileEntry = getFileEntry(sharepointRequest);

return getFileEntryTree(fileEntry, parentFolderPath);
}

@Override
public Tree getDocumentsTree(SharepointRequest sharepointRequest)
throws Exception {
Expand Down Expand Up @@ -147,19 +135,15 @@ public Tree getDocumentsTree(SharepointRequest sharepointRequest)
}

@Override
public Tree getFolderTree(SharepointRequest sharepointRequest)
public Tree getDocumentTree(SharepointRequest sharepointRequest)
throws Exception {

String folderPath = sharepointRequest.getRootPath();
String parentFolderPath = getParentFolderPath(folderPath);

long groupId = SharepointUtil.getGroupId(folderPath);
long folderId = getLastFolderId(
groupId, folderPath, DLFolderConstants.DEFAULT_PARENT_FOLDER_ID);
String documentPath = sharepointRequest.getRootPath();
String parentFolderPath = getParentFolderPath(documentPath);

Folder folder = DLAppServiceUtil.getFolder(folderId);
FileEntry fileEntry = getFileEntry(sharepointRequest);

return getFolderTree(folder, parentFolderPath);
return getFileEntryTree(fileEntry, parentFolderPath);
}

@Override
Expand Down Expand Up @@ -187,6 +171,22 @@ public Tree getFoldersTree(SharepointRequest sharepointRequest)
return foldersTree;
}

@Override
public Tree getFolderTree(SharepointRequest sharepointRequest)
throws Exception {

String folderPath = sharepointRequest.getRootPath();
String parentFolderPath = getParentFolderPath(folderPath);

long groupId = SharepointUtil.getGroupId(folderPath);
long folderId = getLastFolderId(
groupId, folderPath, DLFolderConstants.DEFAULT_PARENT_FOLDER_ID);

Folder folder = DLAppServiceUtil.getFolder(folderId);

return getFolderTree(folder, parentFolderPath);
}

@Override
public void getParentFolderIds(
long groupId, String path, List<Long> folderIds)
Expand Down Expand Up @@ -446,15 +446,6 @@ else if (folder != null) {
removedDocsTree, removedDirsTree, failedDocsTree, failedDirsTree};
}

protected Tree getFolderTree(Folder folder, String parentFolderPath) {
String folderPath = parentFolderPath.concat(StringPool.SLASH).concat(
folder.getName());

return getFolderTree(
folderPath, folder.getCreateDate(), folder.getModifiedDate(),
folder.getLastPostDate());
}

protected FileEntry getFileEntry(SharepointRequest sharepointRequest)
throws Exception {

Expand Down Expand Up @@ -482,4 +473,13 @@ protected Tree getFileEntryTree(
fileEntry.getUserName(), fileEntry.getVersion());
}

protected Tree getFolderTree(Folder folder, String parentFolderPath) {
String folderPath = parentFolderPath.concat(StringPool.SLASH).concat(
folder.getName());

return getFolderTree(
folderPath, folder.getCreateDate(), folder.getModifiedDate(),
folder.getLastPostDate());
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,6 @@ public DLFileEntryResourceImpl(
_fileEntry = fileEntry;
}

@Override
public String getContentType() {
return _fileEntry.getMimeType();
}

@Override
public InputStream getContentAsStream() throws WebDAVException {
try {
Expand All @@ -62,6 +57,11 @@ public InputStream getContentAsStream() throws WebDAVException {
}
}

@Override
public String getContentType() {
return _fileEntry.getMimeType();
}

@Override
public Lock getLock() {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ public String getDomain() {
return _domain;
}

public void setDomain(String domain) {
_domain = domain;
}

public String getResults() {
return _results;
}

public void setDomain(String domain) {
_domain = domain;
}

public void setResults(String results) {
_results = results;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ public DynamicRenderRequest(
}
}

public Map<String, String[]> getDynamicParameterMap() {
return _params;
}

@Override
public String getParameter(String name) {
String[] values = _params.get(name);
Expand Down Expand Up @@ -156,10 +160,6 @@ public void setParameterValues(String name, String[] values) {
_params.put(name, values);
}

public Map<String, String[]> getDynamicParameterMap() {
return _params;
}

private boolean _inherit;
private Map<String, String[]> _params;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ public String[] getClassNames() {
return null;
}

public String getPortletId() {
return null;
}

@Override
public IndexerPostProcessor[] getIndexerPostProcessors() {
throw new UnsupportedOperationException();
}

public String getPortletId() {
return null;
}

@Override
public void registerIndexerPostProcessor(
IndexerPostProcessor indexerPostProcessor) {
Expand Down
10 changes: 5 additions & 5 deletions portal-service/src/com/liferay/portal/model/EventDefinition.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@
*/
public interface EventDefinition extends Serializable {

public QName getQName();
public PortletApp getPortletApp();

public void setQName(QName qName);
public QName getQName();

public String getValueType();

public void setValueType(String valueType);
public void setPortletApp(PortletApp portletApp);

public PortletApp getPortletApp();
public void setQName(QName qName);

public void setPortletApp(PortletApp portletApp);
public void setValueType(String valueType);

}
Loading

0 comments on commit 64d3d42

Please sign in to comment.