Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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: 2 additions & 0 deletions api/src/org/labkey/api/ApiModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.labkey.api.collections.CaseInsensitiveHashSet;
import org.labkey.api.collections.CaseInsensitiveMapWrapper;
import org.labkey.api.collections.CollectionUtils;
import org.labkey.api.collections.DeltaTrackingMap;
import org.labkey.api.collections.LabKeyCollectors;
import org.labkey.api.collections.Sampler;
import org.labkey.api.collections.SwapQueue;
Expand Down Expand Up @@ -384,6 +385,7 @@ public void registerServlets(ServletContext servletCtx)
DatabaseCache.TestCase.class,
DateUtil.TestCase.class,
DbScope.DialectTestCase.class,
DeltaTrackingMap.TestCase.class,
DetailsURL.TestCase.class,
DiskCachingDataIterator.DiskTestCase.class,
EmailTemplate.TestCase.class,
Expand Down
6 changes: 0 additions & 6 deletions api/src/org/labkey/api/admin/FolderImportContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@

import static org.labkey.api.exp.XarContext.XAR_JOB_ID_NAME;

/**
* User: cnathe
* Date: Jan 18, 2012
*/
public class FolderImportContext extends AbstractFolderContext
{
private FileLike _folderXml;
Expand All @@ -57,8 +53,6 @@ public class FolderImportContext extends AbstractFolderContext

private boolean _isNewFolderImport; // if we know the target folder is empty, can skip certain merge logic

public static final String IS_NEW_FOLDER_IMPORT_KEY = "isNewFolderImport";

/** Required for xstream serialization on Java 7 */
@SuppressWarnings({"UnusedDeclaration"})
public FolderImportContext()
Expand Down
Loading
Loading