LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

CCM NG/ccm-cms: Fixed some typos in the classes associated with the AssetPane 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4655 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: e1aeeaff4c
pull/2/head
jensp 2017-03-30 13:23:56 +00:00
parent 64275f2469
commit 4fa468a0d7
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetFolderBrowser.java
View File

@ -94,7 +94,6 @@ public class AssetFolderBrowser extends Table {
final GlobalizedMessage[] headers = {
globalize("cms.ui.folder.name"),
globalize("cms.ui.folder.languages"),
globalize("cms.ui.folder.title"),
globalize("cms.ui.folder.type"),
globalize("cms.ui.folder.creation_date"),
@ -123,7 +122,7 @@ public class AssetFolderBrowser extends Table {
getColumn(AssetFolderBrowserTableModel.COL_LAST_MODIFIED)
.setCellRenderer(new DateCellRenderer());
deleteColumn = getColumn(AssetFolderBrowserTableModel.COL_ACTION);
deleteColumn = getColumn(AssetFolderBrowserTableModel.COL_DELETEABLE);
deleteColumn.setCellRenderer(new ActionCellRenderer());
deleteColumn.setAlign("center");
@ -334,7 +333,7 @@ public class AssetFolderBrowser extends Table {
final Object key,
final int row,
final int column) {
if (((Boolean) value)) {
if ((!(Boolean) value)) {
return new Label(" ", false);
} else {
final ControlLink link = new ControlLink(

22
ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetFolderBrowserTableModel.java
View File

@ -31,24 +31,23 @@ import java.util.List;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
class AssetFolderBrowserTableModel implements TableModel {
protected static final int COL_NAME = 0;
protected static final int COL_TITLE = 1;
protected static final int COL_TYPE = 2;
protected static final int COL_CREATION_DATE = 3;
protected static final int COL_LAST_MODIFIED = 4;
protected static final int COL_DELETEABLE = 5;
protected static final int COL_ACTION = 6;
private final Iterator<AssetFolderBrowserTableRow> iterator;
private AssetFolderBrowserTableRow currentRow;
public AssetFolderBrowserTableModel(
final List<AssetFolderBrowserTableRow> rows) {
final List<AssetFolderBrowserTableRow> rows) {
iterator = rows.iterator();
}
@Override
public int getColumnCount() {
return 6;
@ -66,7 +65,7 @@ class AssetFolderBrowserTableModel implements TableModel {
@Override
public Object getElementAt(final int columnIndex) {
switch(columnIndex) {
switch (columnIndex) {
case COL_NAME:
return currentRow.getName();
case COL_TITLE:
@ -88,7 +87,7 @@ class AssetFolderBrowserTableModel implements TableModel {
return currentRow.isDeletable();
default:
throw new IllegalArgumentException(String.format(
"Illegal column index %d.", columnIndex));
"Illegal column index %d.", columnIndex));
}
}
@ -99,13 +98,12 @@ class AssetFolderBrowserTableModel implements TableModel {
} else {
return String.format("item-%d", currentRow.getObjectId());
}
// return currentRow.getObjectId();
}
public boolean isFolder() {
return currentRow.isFolder();
}
}

3
ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowserController.java
View File

@ -60,9 +60,6 @@ import javax.transaction.Transactional;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.Order;
import javax.persistence.criteria.Path;
import org.hibernate.tool.schema.internal.TargetFileImpl;
import org.libreccm.categorization.ObjectNotAssignedToCategoryException;
import org.libreccm.core.UnexpectedErrorException;
import org.librecms.contentsection.FolderManager;
import static org.librecms.CmsConstants.*;