Skip to content

Commit

Permalink
migrate to jakarta annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
VISTALL committed Dec 29, 2024
1 parent 788daa5 commit af868b1
Show file tree
Hide file tree
Showing 112 changed files with 163 additions and 163 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import java.util.List;
import java.util.Set;

import javax.annotation.Nonnull;
import jakarta.annotation.Nonnull;

/**
* @author Eugene Zhuravlev
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import consulo.virtualFileSystem.VirtualFile;
import consulo.xml.ide.highlighter.XmlFileType;

import javax.annotation.Nonnull;
import jakarta.annotation.Nonnull;
import java.util.HashMap;
import java.util.Map;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import java.util.concurrent.TimeUnit;

import org.jetbrains.annotations.NonNls;
import javax.annotation.Nullable;
import jakarta.annotation.Nullable;
import consulo.logging.Logger;
import consulo.application.util.concurrent.AppExecutorUtil;
import consulo.apache.ant.ApacheAntClasses;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import consulo.xml.util.xml.DomFileElement;
import consulo.xml.util.xml.DomManager;

import javax.annotation.Nullable;
import jakarta.annotation.Nullable;
import javax.swing.*;

public class AntSupport {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import consulo.logging.Logger;
import consulo.util.lang.Pair;
import org.jetbrains.annotations.NonNls;
import javax.annotation.Nullable;
import jakarta.annotation.Nullable;

import java.lang.ref.SoftReference;
import java.lang.reflect.InvocationTargetException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import consulo.virtualFileSystem.VirtualFile;
import consulo.xml.psi.xml.XmlFile;

import javax.annotation.Nullable;
import jakarta.annotation.Nullable;

public interface AntBuildFile {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import consulo.component.util.config.AbstractProperty;
import consulo.util.xml.serializer.InvalidDataException;
import org.jdom.Element;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;

import java.util.Map;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.intellij.lang.ant.config;

import javax.annotation.Nullable;
import jakarta.annotation.Nullable;

public interface AntBuildModel {
@Nullable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package com.intellij.lang.ant.config;

import javax.annotation.Nullable;
import jakarta.annotation.Nullable;

import com.intellij.lang.ant.config.impl.BuildTask;
import com.intellij.lang.ant.dom.AntDomProject;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import com.intellij.lang.ant.config.impl.BuildFileProperty;
import consulo.dataContext.DataContext;
import javax.annotation.Nullable;
import jakarta.annotation.Nullable;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package com.intellij.lang.ant.config;

import javax.annotation.Nullable;
import jakarta.annotation.Nullable;
import com.intellij.lang.ant.config.impl.BuildTask;
import consulo.navigation.OpenFileDescriptor;
import consulo.project.Project;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import consulo.project.Project;
import consulo.virtualFileSystem.VirtualFile;
import org.jetbrains.annotations.NonNls;
import javax.annotation.Nullable;
import jakarta.annotation.Nullable;

@ServiceAPI(ComponentScope.PROJECT)
public abstract class AntConfiguration {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import consulo.project.Project;
import consulo.xml.psi.xml.XmlFile;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import java.util.List;

public abstract class AntConfigurationBase extends AntConfiguration {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import consulo.project.Project;
import consulo.ui.ex.action.*;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
import consulo.xml.psi.xml.XmlTag;
import consulo.xml.util.xml.DomElement;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import java.util.Collections;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import consulo.annotation.component.ExtensionAPI;
import consulo.component.extension.ExtensionPointName;

import javax.annotation.Nullable;
import jakarta.annotation.Nullable;

@ExtensionAPI(ComponentScope.APPLICATION)
public abstract class AntMessageCustomizer {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import consulo.process.cmd.GeneralCommandLine;
import consulo.process.event.ProcessListener;

import javax.annotation.Nonnull;
import jakarta.annotation.Nonnull;

/**
* @author dyoma
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
import consulo.virtualFileSystem.encoding.EncodingProjectManager;
import consulo.virtualFileSystem.util.VirtualFileUtil;

import javax.annotation.Nonnull;
import jakarta.annotation.Nonnull;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import consulo.virtualFileSystem.VirtualFile;
import org.jetbrains.annotations.NonNls;

import javax.annotation.Nullable;
import jakarta.annotation.Nullable;
import java.io.File;

final class HyperlinkUtil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import consulo.language.psi.PsiDocumentManager;
import consulo.virtualFileSystem.VirtualFile;

import javax.annotation.Nullable;
import jakarta.annotation.Nullable;

import javax.swing.tree.DefaultMutableTreeNode;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
import consulo.virtualFileSystem.VirtualFileManager;
import org.jetbrains.annotations.NonNls;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import javax.swing.*;
import java.awt.*;
import java.io.File;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import consulo.virtualFileSystem.VirtualFileManager;
import org.jetbrains.annotations.NonNls;

import javax.annotation.Nullable;
import jakarta.annotation.Nullable;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import consulo.virtualFileSystem.LocalFileSystem;
import consulo.virtualFileSystem.VirtualFile;

import javax.annotation.Nullable;
import jakarta.annotation.Nullable;
import javax.swing.*;
import java.io.File;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
import consulo.virtualFileSystem.VirtualFile;
import org.jetbrains.annotations.NonNls;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import javax.swing.*;
import javax.swing.tree.*;
import java.awt.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import consulo.ui.ex.tree.NodeDescriptor;
import consulo.util.lang.Comparing;

import javax.annotation.Nonnull;
import jakarta.annotation.Nonnull;

public final class AntBuildFileNodeDescriptor extends AntNodeDescriptor {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
import consulo.xml.util.xml.events.DomEvent;
import org.jetbrains.annotations.NonNls;

import javax.annotation.Nullable;
import jakarta.annotation.Nullable;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
import consulo.ui.style.StandardColors;
import consulo.util.concurrent.ActionCallback;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;

final class AntExplorerTreeStructure extends AbstractTreeStructure {
private static final Logger LOG = Logger.getInstance(AntExplorerTreeStructure.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import consulo.ui.ex.SimpleTextAttributes;
import consulo.ui.ex.tree.NodeDescriptor;

import javax.annotation.Nonnull;
import jakarta.annotation.Nonnull;

public abstract class AntNodeDescriptor extends NodeDescriptor implements CellAppearanceEx {
protected final Project myProject;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import consulo.util.lang.Comparing;
import consulo.virtualFileSystem.VirtualFile;

import javax.annotation.Nonnull;
import jakarta.annotation.Nonnull;
import java.awt.*;
import java.util.ArrayList;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import consulo.ui.ex.awt.JBList;
import consulo.util.collection.ArrayUtil;

import javax.annotation.Nonnull;
import jakarta.annotation.Nonnull;

import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
import consulo.virtualFileSystem.VirtualFileManager;
import jakarta.inject.Inject;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;

/**
* @author Vladislav.Kaznacheev
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import java.io.File;
import java.util.*;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import consulo.virtualFileSystem.VirtualFile;
import consulo.xml.psi.xml.XmlFile;

import javax.annotation.Nullable;
import jakarta.annotation.Nullable;
import java.util.*;

public class AntBuildModelImpl implements AntBuildModelBase {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import consulo.virtualFileSystem.VirtualFile;
import consulo.xml.util.xml.DomTarget;

import javax.annotation.Nullable;
import jakarta.annotation.Nullable;
import java.util.List;

public class AntBuildTargetImpl implements AntBuildTargetBase {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import javax.swing.*;
import java.util.*;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;

import javax.annotation.Nullable;
import jakarta.annotation.Nullable;
import java.util.Comparator;

public abstract class AntReference {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;

import javax.annotation.Nullable;
import jakarta.annotation.Nullable;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import consulo.virtualFileSystem.VirtualFile;
import consulo.xml.util.xml.DomTarget;

import javax.annotation.Nullable;
import jakarta.annotation.Nullable;

public final class BuildTask {
public static final BuildTask[] EMPTY_ARRAY = new BuildTask[0];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package com.intellij.lang.ant.config.impl;

import javax.annotation.Nonnull;
import jakarta.annotation.Nonnull;

/**
* @author Eugene Zhuravlev
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import consulo.project.Project;
import consulo.virtualFileSystem.VirtualFile;

import javax.annotation.Nullable;
import jakarta.annotation.Nullable;
import java.util.Arrays;
import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import consulo.util.lang.Comparing;
import org.jetbrains.annotations.NonNls;

import javax.annotation.Nullable;
import jakarta.annotation.Nullable;
import javax.swing.*;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
Expand Down
Loading

0 comments on commit af868b1

Please sign in to comment.