Browse Source

API: Move ColorUtil into util project as it is referenced there.

modulesv2
weisj 3 years ago
parent
commit
ce15294d9e
No known key found for this signature in database
GPG Key ID: 31124CB75461DA2A
  1. 3
      annotations-processor/src/main/java/com/github/weisj/darklaf/annotations/processor/SynthesiseLafProcessor.java
  2. 2
      core/src/main/java/com/github/weisj/darklaf/components/color/SmallColorChooser.java
  3. 2
      core/src/main/java/com/github/weisj/darklaf/graphics/StringPainter.java
  4. 2
      core/src/main/java/com/github/weisj/darklaf/task/ForegroundColorGenerationTask.java
  5. 2
      core/src/main/java/com/github/weisj/darklaf/task/StyleSheetInitTask.java
  6. 4
      core/src/main/java/com/github/weisj/darklaf/ui/DarkPopupFactory.java
  7. 2
      core/src/main/java/com/github/weisj/darklaf/ui/cell/CellUtil.java
  8. 2
      core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/ColorTriangle.java
  9. 2
      core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/DarkColorChooserPanel.java
  10. 2
      core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/SlideComponent.java
  11. 2
      core/src/main/java/com/github/weisj/darklaf/ui/scrollpane/DarkScrollBarUI.java
  12. 2
      core/src/main/java/com/github/weisj/darklaf/ui/table/renderer/DarkColorTableCellRendererEditor.java
  13. 2
      core/src/main/java/com/github/weisj/darklaf/ui/table/renderer/DarkTableCellRenderer.java
  14. 2
      core/src/main/java/com/github/weisj/darklaf/ui/tooltip/DarkToolTipUI.java
  15. 2
      core/src/test/java/com/github/weisj/darklaf/CustomTitleBarTest.java
  16. 2
      core/src/test/java/com/github/weisj/darklaf/documentation/CreateUITable.java
  17. 2
      property-loader/src/main/java/com/github/weisj/darklaf/icons/IconColorMapper.java
  18. 2
      property-loader/src/main/java/com/github/weisj/darklaf/parser/PrimitiveParser.java
  19. 2
      property-loader/src/test/java/com/github/weisj/darklaf/parser/ParserTest.java
  20. 2
      utils/src/main/java/com/github/weisj/darklaf/util/ColorUtil.java
  21. 2
      utils/src/main/java/com/github/weisj/darklaf/util/PropertyUtil.java

3
annotations-processor/src/main/java/com/github/weisj/darklaf/annotations/processor/SynthesiseLafProcessor.java

@ -38,9 +38,6 @@ import javax.tools.JavaFileObject;
import com.github.weisj.darklaf.annotations.SynthesiseLaf;
/**
* @deprecated Auto-Generated class. Use LafManager.installTheme(Theme) instead.
*/
@SupportedAnnotationTypes("com.github.weisj.darklaf.annotations.SynthesiseLaf")
public class SynthesiseLafProcessor extends AbstractProcessor {

2
core/src/main/java/com/github/weisj/darklaf/components/color/SmallColorChooser.java

@ -32,7 +32,6 @@ import javax.swing.*;
import javax.swing.border.Border;
import javax.swing.text.*;
import com.github.weisj.darklaf.color.ColorUtil;
import com.github.weisj.darklaf.color.DarkColorModel;
import com.github.weisj.darklaf.color.DarkColorModelHSB;
import com.github.weisj.darklaf.color.DarkColorModelHSL;
@ -50,6 +49,7 @@ import com.github.weisj.darklaf.ui.colorchooser.ColorTriangle;
import com.github.weisj.darklaf.ui.colorchooser.ColorValueFormatter;
import com.github.weisj.darklaf.ui.slider.DarkSliderUI;
import com.github.weisj.darklaf.ui.tabbedpane.DarkTabbedPaneUI;
import com.github.weisj.darklaf.util.ColorUtil;
import com.github.weisj.darklaf.util.DarkUIUtil;
import com.github.weisj.darklaf.util.graphics.GraphicsUtil;

2
core/src/main/java/com/github/weisj/darklaf/graphics/StringPainter.java

@ -32,9 +32,9 @@ import javax.swing.*;
import javax.swing.plaf.basic.BasicHTML;
import javax.swing.text.View;
import com.github.weisj.darklaf.color.ColorUtil;
import com.github.weisj.darklaf.ui.OpacityBufferedUI;
import com.github.weisj.darklaf.util.*;
import com.github.weisj.darklaf.util.ColorUtil;
import com.github.weisj.darklaf.util.graphics.GraphicsContext;
import com.github.weisj.darklaf.util.graphics.GraphicsUtil;

2
core/src/main/java/com/github/weisj/darklaf/task/ForegroundColorGenerationTask.java

@ -29,12 +29,12 @@ import java.util.logging.Logger;
import javax.swing.plaf.ColorUIResource;
import com.github.weisj.darklaf.color.ColorUtil;
import com.github.weisj.darklaf.color.DarkColorModelHSB;
import com.github.weisj.darklaf.color.DarkColorModelHSL;
import com.github.weisj.darklaf.theme.Theme;
import com.github.weisj.darklaf.theme.info.AccentColorRule;
import com.github.weisj.darklaf.uiresource.DarkColorUIResource;
import com.github.weisj.darklaf.util.ColorUtil;
import com.github.weisj.darklaf.util.LogUtil;
import com.github.weisj.darklaf.util.Types;

2
core/src/main/java/com/github/weisj/darklaf/task/StyleSheetInitTask.java

@ -27,8 +27,8 @@ import javax.swing.*;
import javax.swing.text.html.HTMLEditorKit;
import javax.swing.text.html.StyleSheet;
import com.github.weisj.darklaf.color.ColorUtil;
import com.github.weisj.darklaf.theme.Theme;
import com.github.weisj.darklaf.util.ColorUtil;
public class StyleSheetInitTask implements DefaultsInitTask {

4
core/src/main/java/com/github/weisj/darklaf/ui/DarkPopupFactory.java

@ -30,11 +30,11 @@ import java.util.logging.Logger;
import javax.swing.*;
import javax.swing.plaf.RootPaneUI;
import com.github.weisj.darklaf.color.ColorUtil;
import com.github.weisj.darklaf.platform.DecorationsHandler;
import com.github.weisj.darklaf.ui.rootpane.DarkRootPaneUI;
import com.github.weisj.darklaf.uiresource.DarkColorUIResource;
import com.github.weisj.darklaf.util.*;
import com.github.weisj.darklaf.util.ColorUtil;
import com.github.weisj.darklaf.util.graphics.GraphicsUtil;
public class DarkPopupFactory extends PopupFactory {
@ -252,7 +252,7 @@ public class DarkPopupFactory extends PopupFactory {
}
}
protected HeavyWeightParent getHeavyWeightParent(final Container owner) {
private HeavyWeightParent getHeavyWeightParent(final Container owner) {
if (heavyWeightParent == null) {
JComponent box = Box.createHorizontalBox();
super.getPopup(null, box, 0, 0);

2
core/src/main/java/com/github/weisj/darklaf/ui/cell/CellUtil.java

@ -26,11 +26,11 @@ import java.awt.*;
import javax.swing.*;
import javax.swing.tree.DefaultTreeCellRenderer;
import com.github.weisj.darklaf.color.ColorUtil;
import com.github.weisj.darklaf.ui.list.DarkListUI;
import com.github.weisj.darklaf.ui.table.DarkTableUI;
import com.github.weisj.darklaf.ui.table.renderer.IconWrapper;
import com.github.weisj.darklaf.ui.tree.DarkTreeUI;
import com.github.weisj.darklaf.util.ColorUtil;
import com.github.weisj.darklaf.util.DarkUIUtil;
import com.github.weisj.darklaf.util.PropertyKey;
import com.github.weisj.darklaf.util.PropertyUtil;

2
core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/ColorTriangle.java

@ -32,11 +32,11 @@ import java.util.List;
import javax.swing.*;
import com.github.weisj.darklaf.color.ColorUtil;
import com.github.weisj.darklaf.color.DarkColorModel;
import com.github.weisj.darklaf.color.DarkColorModelHSB;
import com.github.weisj.darklaf.color.DarkColorModelHSL;
import com.github.weisj.darklaf.color.DarkColorModelRGB;
import com.github.weisj.darklaf.util.ColorUtil;
import com.github.weisj.darklaf.util.graphics.GraphicsContext;
import com.github.weisj.darklaf.util.graphics.GraphicsUtil;

2
core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/DarkColorChooserPanel.java

@ -28,12 +28,12 @@ import javax.swing.colorchooser.AbstractColorChooserPanel;
import javax.swing.colorchooser.ColorSelectionModel;
import javax.swing.event.AncestorEvent;
import com.github.weisj.darklaf.color.ColorUtil;
import com.github.weisj.darklaf.color.DarkColorModel;
import com.github.weisj.darklaf.components.DefaultColorPipette;
import com.github.weisj.darklaf.listener.AncestorAdapter;
import com.github.weisj.darklaf.listener.UpdateDocumentListener;
import com.github.weisj.darklaf.ui.button.DarkButtonUI;
import com.github.weisj.darklaf.util.ColorUtil;
import com.github.weisj.darklaf.util.PropertyUtil;
/**

2
core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/SlideComponent.java

@ -32,10 +32,10 @@ import java.util.function.Consumer;
import javax.swing.*;
import com.github.weisj.darklaf.color.ColorUtil;
import com.github.weisj.darklaf.components.tooltip.ToolTipContext;
import com.github.weisj.darklaf.graphics.PaintUtil;
import com.github.weisj.darklaf.util.Alignment;
import com.github.weisj.darklaf.util.ColorUtil;
/**
* @author Alexey Pegov

2
core/src/main/java/com/github/weisj/darklaf/ui/scrollpane/DarkScrollBarUI.java

@ -28,8 +28,8 @@ import javax.swing.event.ChangeEvent;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.basic.BasicScrollBarUI;
import com.github.weisj.darklaf.color.ColorUtil;
import com.github.weisj.darklaf.graphics.PaintUtil;
import com.github.weisj.darklaf.util.ColorUtil;
import com.github.weisj.darklaf.util.PropertyUtil;
/** @author Jannis Weis */

2
core/src/main/java/com/github/weisj/darklaf/ui/table/renderer/DarkColorTableCellRendererEditor.java

@ -29,8 +29,8 @@ import javax.swing.*;
import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer;
import com.github.weisj.darklaf.color.ColorUtil;
import com.github.weisj.darklaf.components.color.PopupColorChooser;
import com.github.weisj.darklaf.util.ColorUtil;
/** @author Jannis Weis */
public class DarkColorTableCellRendererEditor extends AbstractCellEditor implements TableCellRenderer, TableCellEditor {

2
core/src/main/java/com/github/weisj/darklaf/ui/table/renderer/DarkTableCellRenderer.java

@ -26,7 +26,7 @@ import java.awt.*;
import javax.swing.*;
import javax.swing.table.DefaultTableCellRenderer;
import com.github.weisj.darklaf.color.ColorUtil;
import com.github.weisj.darklaf.util.ColorUtil;
/** @author Jannis Weis */
public class DarkTableCellRenderer extends DefaultTableCellRenderer {

2
core/src/main/java/com/github/weisj/darklaf/ui/tooltip/DarkToolTipUI.java

@ -33,12 +33,12 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.basic.BasicToolTipUI;
import javax.swing.text.View;
import com.github.weisj.darklaf.color.ColorUtil;
import com.github.weisj.darklaf.components.tooltip.ToolTipStyle;
import com.github.weisj.darklaf.graphics.*;
import com.github.weisj.darklaf.ui.DarkPopupFactory;
import com.github.weisj.darklaf.uiresource.DarkColorUIResource;
import com.github.weisj.darklaf.util.Alignment;
import com.github.weisj.darklaf.util.ColorUtil;
import com.github.weisj.darklaf.util.DarkUIUtil;
import com.github.weisj.darklaf.util.PropertyKey;
import com.github.weisj.darklaf.util.graphics.GraphicsContext;

2
core/src/test/java/com/github/weisj/darklaf/CustomTitleBarTest.java

@ -34,10 +34,10 @@ import org.junit.jupiter.api.*;
import org.junit.jupiter.api.condition.EnabledOnOs;
import org.junit.jupiter.api.condition.OS;
import com.github.weisj.darklaf.color.ColorUtil;
import com.github.weisj.darklaf.theme.DarculaTheme;
import com.github.weisj.darklaf.theme.IntelliJTheme;
import com.github.weisj.darklaf.ui.rootpane.DarkRootPaneUI;
import com.github.weisj.darklaf.util.ColorUtil;
import com.github.weisj.darklaf.util.SystemInfo;
class CustomTitleBarTest extends AbstractImageTest implements NonThreadSafeTest {

2
core/src/test/java/com/github/weisj/darklaf/documentation/CreateUITable.java

@ -39,7 +39,6 @@ import javax.swing.border.EmptyBorder;
import com.github.weisj.darklaf.DarkLaf;
import com.github.weisj.darklaf.LafManager;
import com.github.weisj.darklaf.color.ColorUtil;
import com.github.weisj.darklaf.components.border.DropShadowBorder;
import com.github.weisj.darklaf.defaults.SampleRenderer;
import com.github.weisj.darklaf.icons.DarkSVGIcon;
@ -50,6 +49,7 @@ import com.github.weisj.darklaf.parser.ParseResult;
import com.github.weisj.darklaf.parser.Parser;
import com.github.weisj.darklaf.parser.PrimitiveParser;
import com.github.weisj.darklaf.theme.Theme;
import com.github.weisj.darklaf.util.ColorUtil;
import com.github.weisj.darklaf.util.ImageUtil;
import com.github.weisj.darklaf.util.StringUtil;
import com.github.weisj.darklaf.util.SystemInfo;

2
property-loader/src/main/java/com/github/weisj/darklaf/icons/IconColorMapper.java

@ -30,10 +30,10 @@ import java.util.logging.Logger;
import javax.swing.*;
import com.github.weisj.darklaf.PropertyLoader;
import com.github.weisj.darklaf.color.ColorUtil;
import com.github.weisj.darklaf.parser.ParseResult;
import com.github.weisj.darklaf.parser.Parser;
import com.github.weisj.darklaf.parser.ParserContext;
import com.github.weisj.darklaf.util.ColorUtil;
import com.github.weisj.darklaf.util.LogUtil;
import com.github.weisj.darklaf.util.Pair;
import com.github.weisj.darklaf.util.Types;

2
property-loader/src/main/java/com/github/weisj/darklaf/parser/PrimitiveParser.java

@ -23,8 +23,8 @@ package com.github.weisj.darklaf.parser;
import java.awt.Color;
import com.github.weisj.darklaf.color.ColorUtil;
import com.github.weisj.darklaf.uiresource.DarkColorUIResource;
import com.github.weisj.darklaf.util.ColorUtil;
import com.github.weisj.darklaf.util.PropertyValue;
public class PrimitiveParser implements PropertyParser {

2
property-loader/src/test/java/com/github/weisj/darklaf/parser/ParserTest.java

@ -37,8 +37,8 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import com.github.weisj.darklaf.color.ColorUtil;
import com.github.weisj.darklaf.icons.IconLoader;
import com.github.weisj.darklaf.util.ColorUtil;
class ParserTest {

2
property-loader/src/main/java/com/github/weisj/darklaf/color/ColorUtil.java → utils/src/main/java/com/github/weisj/darklaf/util/ColorUtil.java

@ -19,7 +19,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
package com.github.weisj.darklaf.color;
package com.github.weisj.darklaf.util;
import java.awt.*;

2
utils/src/main/java/com/github/weisj/darklaf/util/PropertyUtil.java

@ -32,8 +32,6 @@ import javax.swing.*;
import javax.swing.border.Border;
import javax.swing.plaf.UIResource;
import com.github.weisj.darklaf.color.ColorUtil;
public final class PropertyUtil {
public static boolean canOverwrite(final Object o) {

Loading…
Cancel
Save